Fix missing env variables and remove special from build-docker

celeritas-project · Mar 19, 2024 · 1b923db · 1b923db
1 parent 20ada5d
commit 1b923db
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
@@ -12,16 +12,13 @@ jobs:
   # and won't actually run on device
   gpu:
     name: >-
-      ${{format('{0}-{1}-{2}{3}{4}',
-                matrix.image,
-                matrix.buildtype,
+      ${{format('{0}-{1}-{2}',
                 matrix.geometry,
-                matrix.special && '-' || '',
-                matrix.special)}}
+                matrix.buildtype,
+                matrix.image)}}
     strategy:
       fail-fast: false
       matrix:
-        special: [null]
         geometry: ['orange', 'vecgeom']
         buildtype: ['debug', 'ndebug']
         image: ['ubuntu-cuda', 'centos-rocm']
@@ -35,15 +32,12 @@ jobs:
             buildtype: 'reldeb'
             image: 'ubuntu-cuda'
     env:
-      ASAN_OPTIONS: "detect_leaks=0"
       CELER_TEST_STRICT: 1
       CELER_DISABLE_DEVICE: 1 # IMPORTANT
       CMAKE_PRESET: >-
-        ${{format('{0}-{1}{2}{3}',
+        ${{format('{0}-{1}',
                 matrix.buildtype,
-                matrix.geometry,
-                matrix.special && '-' || '',
-                matrix.special)}}
+                matrix.geometry)}}
     runs-on: ubuntu-latest
     container:
       image: >-

diff --git a/.github/workflows/build-spack.yml b/.github/workflows/build-spack.yml
@@ -42,6 +42,7 @@ jobs:
             special: "asan"
             geant: "11.0"
     env:
+      ASAN_OPTIONS: "detect_leaks=0"
       CCACHE_DIR: "${{github.workspace}}/.ccache"
       CCACHE_MAXSIZE: "1G"
       CMAKE_PRESET: >-
@@ -135,6 +136,9 @@ jobs:
         working-directory: build
         continue-on-error: ${{matrix.geant != '11.0'}} # TODO: disable or fix failing tests
         run: |
+          if [ ${{matrix.geant}} == "11.0" ]; then
+            export CELER_TEST_STRICT=1
+          fi
           ctest --parallel $(nproc) --timeout 15 --output-on-failure \
             --test-output-size-passed=32768 --test-output-size-failed=1048576
       - name: Install