Switching to Alma9 in benchmarks and format workflows (#392)

HEP-FCC · Jul 18, 2024 · c47193b · c47193b
1 parent 436a4b5
commit c47193b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
@@ -12,39 +12,43 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - SETUP: '/cvmfs/sw.hsf.org/key4hep/setup.sh'
+        - STACK: '/cvmfs/sw.hsf.org/key4hep/setup.sh'
           NAME: prod
-        - SETUP: '/cvmfs/sw-nightlies.hsf.org/key4hep/setup.sh'
+        - STACK: '/cvmfs/sw-nightlies.hsf.org/key4hep/setup.sh'
           NAME: nightly
     steps:
     - uses: actions/checkout@v4
     - uses: cvmfs-contrib/github-action-cvmfs@v4
     - name: Start container
       run: |
-        docker run -it --name CI_container -v ${GITHUB_WORKSPACE}:/Package -v /cvmfs:/cvmfs:shared -d ghcr.io/aidasoft/centos7:latest /bin/bash
+        docker run -it --name CI_container \
+                   -v ${GITHUB_WORKSPACE}:/Package \
+                   -v /cvmfs:/cvmfs:shared \
+                   -d ghcr.io/key4hep/key4hep-images/alma9:latest \
+                   /bin/bash
     - name: CMake Configure
       run: |
         docker exec CI_container /bin/bash -c 'cd Package;\
          mkdir -p build install;\
-         source ${{ matrix.SETUP }};\
+         source ${{ matrix.STACK }};\
          cd build;\
-         cmake -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_CXX_STANDARD=17  -DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always " -G Ninja ..;'
+         cmake -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always " -G Ninja ..;'
     - name: Compile
       run: |
         docker exec CI_container /bin/bash -c 'cd ./Package;\
-        source ${{ matrix.SETUP }};\
+        source ${{ matrix.STACK }};\
         cd build;\
         ninja -k0;'
     - name: Install
       run: |
         docker exec CI_container /bin/bash -c 'cd ./Package;\
-          source ${{ matrix.SETUP }};\
+          source ${{ matrix.STACK }};\
           cd build;\
           ninja -k0 install;'
     - name: Test
       run: |
         docker exec CI_container /bin/bash -c 'cd ./Package;\
-        source ${{ matrix.SETUP }};\
+        source ${{ matrix.STACK }};\
         cd build;\
         ninja -k0 && ctest --output-on-failure;'
     - name: Prepare benchmark outputs

diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -6,13 +6,17 @@ jobs:
   format:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - uses: cvmfs-contrib/github-action-cvmfs@v3
+    - uses: cvmfs-contrib/github-action-cvmfs@v4
     - name: Start container
       run: |
-        docker run -it --name CI_container -v ${GITHUB_WORKSPACE}:/Package -v /cvmfs:/cvmfs:shared -d ghcr.io/aidasoft/centos7:latest /bin/bash
+        docker run -it --name CI_container \
+                   -v ${GITHUB_WORKSPACE}:/Package \
+                   -v /cvmfs:/cvmfs:shared \
+                   -d ghcr.io/key4hep/key4hep-images/alma9:latest \
+                   /bin/bash
     - name: Add upstream
       run: |
         docker exec CI_container /bin/bash -c 'cd ./Package

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -13,8 +13,8 @@ jobs:
         OS: ['alma9',
              'ubuntu22']
     steps:
-    - uses: actions/checkout@v3
-    - uses: cvmfs-contrib/github-action-cvmfs@v3
+    - uses: actions/checkout@v4
+    - uses: cvmfs-contrib/github-action-cvmfs@v4
     - name: Start container
       run: |
         docker run -it --name CI_container \