ci: consolidate ROOT5&6 tests into single test matrix (#598)

star-bnl · Oct 13, 2023 · 07909ba · 07909ba
1 parent e40f663
commit 07909ba
Showing 1 changed file with 4 additions and 26 deletions.
diff --git a/.github/workflows/build-pull-request.yml b/.github/workflows/build-pull-request.yml
@@ -41,16 +41,17 @@ jobs:
           name: star-sw-${{ env.STARENV }}
           path: /tmp/star-sw-${{ env.STARENV }}.tar
 
-  ROOT5_test:
+  test:
     runs-on: ubuntu-latest
     needs: build
     strategy:
       fail-fast: false
       matrix:
         test_id: [10, 11, 22, 23, 24, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 59, 60, 76, 77, 78, 90, 91, 92, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125]
-        compiler: [gcc485, gcc11]
+        starenv: [root5, root6]
+        compiler: [gcc485]
     env:
-      STARENV: root5-${{ matrix.compiler }}
+      STARENV: ${{ matrix.starenv }}-${{ matrix.compiler }}
     steps:
       - name: Download artifact
         uses: actions/download-artifact@v3
@@ -115,26 +116,3 @@ jobs:
              TEST_CMD="root4star -b -q -l 'StRoot/macros/analysis/find_vertex.C(\"$TEST_FILE\")'"
              docker run --volumes-from star-test-data ghcr.io/star-bnl/star-sw-${{ env.STARENV }} \
                sh -c "set -e; $TEST_CMD 2>&1 | tee log;  grep '<StIOMaker::Finish> StIO:' log"
-
-  ROOT6_test:
-    runs-on: ubuntu-latest
-    needs: build
-    strategy:
-      fail-fast: false
-      matrix:
-        test_id: [10, 11, 22, 23, 24, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 59, 60, 76, 77, 78, 90, 91, 92, 102, 103, 119, 120, 121, 122, 123]
-    env:
-      STARENV: root6-gcc485
-    steps:
-      - name: Download artifact
-        uses: actions/download-artifact@v3
-        with:
-          name: star-sw-${{ env.STARENV }}
-          path: /tmp
-
-      - run: docker load --input /tmp/star-sw-${{ env.STARENV }}.tar
-      - run: docker run --name star-test-data --volume /star ghcr.io/star-bnl/star-test-data:v7
-      - run: |
-             TEST_CMD=$(docker run --rm ghcr.io/star-bnl/star-sw-${{ env.STARENV }} tests/executest.py -c ${{ matrix.test_id }})
-             docker run --volumes-from star-test-data ghcr.io/star-bnl/star-sw-${{ env.STARENV }} \
-               sh -l -c "module unload kfparticle-1.1-root-6.16.00; MALLOC_CHECK_=3 $TEST_CMD"