Merge pull request #951 from svalinn/streamline-dependencies

Streamline dependencies of docker CI images
svalinn · Mar 5, 2024 · 594f7f7 · 594f7f7
2 parents 936926c + cf6363c
commit 594f7f7
Show file tree

Hide file tree

Showing 6 changed files with 120 additions and 116 deletions.
diff --git a/.github/actions/upstream-test/action.yml b/.github/actions/upstream-test/action.yml
@@ -20,7 +20,7 @@ inputs:
   hdf5_version:
     description: Version of HDF5
     required: false
-    default: 1.14.3
+    default: hdf5_1_14_3
   moab_version:
     description: Version of MOAB
     required: false

diff --git a/.github/workflows/docker_publish.yml b/.github/workflows/docker_publish.yml
@@ -23,16 +23,16 @@ jobs:
           clang,
         ]
         hdf5_version : [
-          1.14.3,
+          hdf5_1_14_3,
         ]
         moab_version : [
           5.4.1,
           5.5.1,
         ]
         geant4_version : [
           off,
-          10.7.4,
-          11.1.2
+          v10.7.4,
+          v11.2.1,
         ]
         double_down_version : [
           off,
@@ -105,16 +105,16 @@ jobs:
           clang,
         ]
         hdf5_version : [
-          1.14.3,
+          hdf5_1_14_3,
         ]
         moab_version : [
           5.4.1,
           5.5.1,
         ]
         geant4_version : [
           off,
-          10.7.4,
-          11.1.2
+          v10.7.4,
+          v11.2.1,
         ]
         double_down_version : [
           off,

diff --git a/.github/workflows/linux_upstream_test_geant4.yml b/.github/workflows/linux_upstream_test_geant4.yml
@@ -1,4 +1,4 @@
-name: Test against newer Geant4 on PR merge
+name: Test against Geant4 development branch (master) on PR merge
 
 on:
   # allows us to run workflows manually
@@ -27,4 +27,4 @@ jobs:
         uses: ./.github/actions/upstream-test
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          geant_version: 11.1.2
+          geant_version: master
diff --git a/.github/workflows/linux_upstream_test_hdf5.yml b/.github/workflows/linux_upstream_test_hdf5.yml
@@ -1,4 +1,4 @@
-name: Test against newer hdf5 on PR merge
+name: Test against HDF5 development branch on PR merge
 
 on:
   # allows us to run workflows manually
@@ -28,4 +28,4 @@ jobs:
         uses: ./.github/actions/upstream-test
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          hdf5_version: 1.14.3
+          hdf5_version: develop