one arg per line

svalinn · Dec 21, 2023 · d2aaca9 · d2aaca9
1 parent fe7acca
commit d2aaca9
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/.github/actions/upstream-test/action.yml b/.github/actions/upstream-test/action.yml
@@ -62,4 +62,10 @@ runs:
           parallel: true
           tag-latest-on-default: false
           dockerfile: CI/Dockerfile
-          build-args: UBUNTU_VERSION=${{ inputs.ubuntu_version }}, COMPILER=${{ inputs.compiler }}, HDF5_VERSION=${{ inputs.hdf5_version }}, MOAB_VERSION=${{ inputs.moab_version }}, GEANT4_VERSION=${{ inputs.geant4_version }}, DOUBLE_DOWN_VERSION=${{ inputs.double_down_version }}
+          build-args: >
+            UBUNTU_VERSION=${{ inputs.ubuntu_version }}, 
+            COMPILER=${{ inputs.compiler }}, 
+            HDF5_VERSION=${{ inputs.hdf5_version }}, 
+            MOAB_VERSION=${{ inputs.moab_version }}, 
+            GEANT4_VERSION=${{ inputs.geant4_version }}, 
+            DOUBLE_DOWN_VERSION=${{ inputs.double_down_version }}
diff --git a/.github/workflows/docker_publish.yml b/.github/workflows/docker_publish.yml
@@ -78,7 +78,13 @@ jobs:
           parallel: true
           tag-latest-on-default: ${{ env.tag-latest-on-default }}
           dockerfile: CI/Dockerfile
-          build-args: UBUNTU_VERSION=${{ matrix.ubuntu_version }}, COMPILER=${{ matrix.compiler }}, HDF5_VERSION=${{ matrix.hdf5_version }}, MOAB_VERSION=${{ matrix.moab_version }}, GEANT4_VERSION=${{ matrix.geant4_version }}, DOUBLE_DOWN_VERSION=${{ matrix.double_down_version}}
+          build-args: > 
+            UBUNTU_VERSION=${{ matrix.ubuntu_version }},
+            COMPILER=${{ matrix.compiler }},
+            HDF5_VERSION=${{ matrix.hdf5_version }},
+            MOAB_VERSION=${{ matrix.moab_version }},
+            GEANT4_VERSION=${{ matrix.geant4_version }},
+            DOUBLE_DOWN_VERSION=${{ matrix.double_down_version}}
 
 
   push_stable_ci_img:

diff --git a/.github/workflows/linux_build_test.yml b/.github/workflows/linux_build_test.yml
@@ -59,7 +59,17 @@ jobs:
         ]
 
     container:
-      image: ghcr.io/svalinn/dagmc-ci-ubuntu-${{ matrix.ubuntu_version }}-${{ matrix.compiler}}-hdf5_${{ matrix.hdf5_version}}-moab_${{ matrix.moab_version }}${{ matrix.geant4_version != 'OFF' && '-geant4_' || '' }}${{ matrix.geant4_version != 'OFF' && matrix.geant4_version || '' }}${{ matrix.double_down_version != 'OFF' && '-double_down_' || '' }}${{ matrix.double_down_version != 'OFF' && matrix.double_down_version || '' }}/moab:latest
+      image: > 
+        ghcr.io/svalinn/dagmc-ci
+        -ubuntu-${{ matrix.ubuntu_version }}
+        -${{ matrix.compiler}}
+        -hdf5_${{ matrix.hdf5_version}}
+        -moab_${{ matrix.moab_version }}
+        ${{ matrix.geant4_version != 'OFF' && '-geant4_' || '' }}
+        ${{ matrix.geant4_version != 'OFF' && matrix.geant4_version || '' }}
+        ${{ matrix.double_down_version != 'OFF' && '-double_down_' || '' }}
+        ${{ matrix.double_down_version != 'OFF' && matrix.double_down_version || '' }}
+        /moab:latest
 
     steps:
       - name: Checkout repository