Fix more labels etc

sethrj · Sep 18, 2024 · 5bdd4a6 · 5bdd4a6
1 parent 6016d42
commit 5bdd4a6
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/.github/workflows/build-fast.yml b/.github/workflows/build-fast.yml
@@ -102,6 +102,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{steps.test.outcome == 'success'
                || steps.test.outcome == 'failure'}}
+        with:
           name: test-results-fast-${{matrix.compiler}}-${{matrix.version}}
           path: "build/test-results.junit.xml"
           if-no-files-found: error
@@ -165,6 +166,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{steps.test.outcome == 'success'
                || steps.test.outcome == 'failure'}}
+        with:
           name: test-results-fast-windows
           path: "build/test-results.junit.xml"
           if-no-files-found: error

diff --git a/.github/workflows/build-spack.yml b/.github/workflows/build-spack.yml
@@ -150,7 +150,8 @@ jobs:
             # Note this is ignored for geant4, float, clhep
             export CELER_TEST_STRICT=1
           fi
-          ctest --parallel $(nproc) --timeout 15 --output-on-failure
+          ctest --parallel $(nproc) --timeout 15 --output-on-failure \
+            --output-junit test-results.junit.xml
       - name: Upload failed tests
         if: ${{steps.test.outcome == 'failure'}}
         uses: actions/upload-artifact@v4
@@ -162,6 +163,16 @@ jobs:
             build/**/*.out.json
             build/Testing/Temporary/LastTest.log
             build/Testing/Temporary/LastTestsFailed.log
+      - name: Upload test results
+        uses: actions/upload-artifact@v4
+        if: ${{ fromJSON(matrix.geant) < 11
+              && (steps.test.outcome == 'success'
+               || steps.test.outcome == 'failure')}}
+        with:
+          name: test-results-spack-${{matrix.compiler}}-${{matrix.version}}
+          path: "build/test-results.junit.xml"
+          if-no-files-found: error
+          retention-days: 1
       - name: Check using build directory as install
         # TODO: ASAN requires flags downstream
         if: >-

diff --git a/.github/workflows/build-ultralite.yml b/.github/workflows/build-ultralite.yml
@@ -79,6 +79,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{steps.test.outcome == 'success'
                || steps.test.outcome == 'failure'}}
+        with:
           name: test-results-ultralite-ubuntu
           path: "build/test-results.junit.xml"
           if-no-files-found: error
@@ -120,6 +121,7 @@ jobs:
         run: |
           cmake --build --preset=$Env:CMAKE_PRESET 
       - name: Test all
+        id: test
         continue-on-error: true
         run: |
           ctest --preset=$Env:CMAKE_PRESET \
@@ -138,7 +140,9 @@ jobs:
           retention-days: 7
       - name: Upload test results
         uses: actions/upload-artifact@v4
-        if: ${{!cancelled()}}
+        if: ${{steps.test.outcome == 'success'
+               || steps.test.outcome == 'failure'}}
+        with:
           name: test-results-ultralite-windows
           path: "build/test-results.junit.xml"
           if-no-files-found: error