Skip to content

Commit

Permalink
Merge pull request #951 from svalinn/streamline-dependencies
Browse files Browse the repository at this point in the history
Streamline dependencies of docker CI images
  • Loading branch information
gonuke authored Mar 5, 2024
2 parents 936926c + cf6363c commit 594f7f7
Show file tree
Hide file tree
Showing 6 changed files with 120 additions and 116 deletions.
2 changes: 1 addition & 1 deletion .github/actions/upstream-test/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/docker_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linux_upstream_test_geant4.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -27,4 +27,4 @@ jobs:
uses: ./.github/actions/upstream-test
with:
token: ${{ secrets.GITHUB_TOKEN }}
geant_version: 11.1.2
geant_version: master
4 changes: 2 additions & 2 deletions .github/workflows/linux_upstream_test_hdf5.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -28,4 +28,4 @@ jobs:
uses: ./.github/actions/upstream-test
with:
token: ${{ secrets.GITHUB_TOKEN }}
hdf5_version: 1.14.3
hdf5_version: develop
Loading

0 comments on commit 594f7f7

Please sign in to comment.