Simplify

artis-mcrt · Nov 11, 2024 · 9ec341d · 9ec341d
1 parent 4c133ab
commit 9ec341d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 22 deletions.
diff --git a/.github/workflows/ci-checks.yml b/.github/workflows/ci-checks.yml
@@ -6,9 +6,6 @@ on:
         branches-ignore:
             - classic*
     workflow_dispatch:
-    # pull_request:
-    #     branches-ignore:
-    #         - classic*
 
 jobs:
     cppcheck:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,5 +1,5 @@
 ---
-name: CI
+name: CI tests
 
 on:
     push:
@@ -8,19 +8,14 @@ on:
     schedule:
         - cron: 0 13 * * 1
     workflow_dispatch:
-    # pull_request:
-    #     branches-ignore:
-    #         - classic*
-    workflow_call: # for manual triggering of the combine_checksums job
+    workflow_call: # for triggering the full test mode
         inputs:
+            # test mode enables the santizers and additional assertions
             testmode:
                 required: false
                 default: 'OFF'
                 type: string
 
-env:
-    ASAN_OPTIONS: detect_stack_use_after_return=1:detect_leaks=0
-
 jobs:
     testmodels:
         strategy:
@@ -41,7 +36,6 @@ jobs:
                         nebular_1d_3dgrid_limitbfest,
                     ]
             fail-fast: false
-            max-parallel: 12
 
         runs-on: ${{ matrix.os }}
         timeout-minutes: 120
@@ -274,7 +268,7 @@ jobs:
 
     combine_checksums:
         needs: testmodels
-        if: always()
+        if: always() && inputs.testmode == 'OFF'
         runs-on: ubuntu-24.04
         steps:
             - name: Download test output

diff --git a/.github/workflows/cislowtestmode.yml b/.github/workflows/cislowtestmode.yml
@@ -1,23 +1,20 @@
 ---
-name: CI slow test mode
+name: CI slow full test mode
 
 on:
     push:
-        branches-ignore:
-            - classic*
-    schedule:
-        - cron: 0 13 * * 1
+        branches:
+            - main
+            - develop
     workflow_dispatch:
-    # pull_request:
-    #     branches-ignore:
-    #         - classic*
+    pull_request:
 
 env:
     ASAN_OPTIONS: detect_stack_use_after_return=1:detect_leaks=0
 
 jobs:
     citestmode:
-        name: CI slow test mode
+        name: CI slow full test mode
         uses: artis-mcrt/artis/.github/workflows/ci.yml@cisplittestmode
         with:
             testmode: ON