Allow Double Down v1.1.0 Installation in Dockerfile

.github/actions/upstream-test/action.yml

@@ -5,7 +5,7 @@ inputs:
     description: token for logging in to the GHCR
     required: true
     default: ''
-  geant_version:
+  geant4_version:
     description: Version of Geant4
     required: false
     default: 11.1.2
@@ -25,10 +25,10 @@ inputs:
     description: Version of MOAB
     required: false
     default: 5.3.0
-  double_down:
-    description: Whether or not to test Double Down
+  double_down_version:
+    description: Version of Double Down
     required: false
-    default: OFF
+    default: v1.1.0
 
 runs:
   using: "composite"
@@ -50,4 +50,4 @@ runs:
           parallel: true
           tag-latest-on-default: false
           dockerfile: CI/Dockerfile
-          build-args: COMPILER=${{ inputs.compiler }}, geant4_version=${{ inputs.geant_version }}, UBUNTU_VERSION=${{ inputs.ubuntu_version }}, HDF5_VERSION=${{ inputs.hdf5_version }}, MOAB_BRANCH=${{ inputs.moab_version }}, double_down=${{ inputs.double_down }}
+          build-args: COMPILER=${{ inputs.compiler }}, Geant4_VERSION=${{ inputs.geant4_version }}, UBUNTU_VERSION=${{ inputs.ubuntu_version }}, HDF5_VERSION=${{ inputs.hdf5_version }}, MOAB_VERSION=${{ inputs.moab_version }}, DOUBLE_DOWN_VERSION=${{ inputs.double_down_version }}

.github/workflows/docker_publish.yml

@@ -14,24 +14,24 @@ jobs:
 
     strategy:
       matrix:
-        ubuntu_versions : [
+        ubuntu_version : [
           20.04,
           22.04,
           ]
         compiler : [
           gcc,
           clang,
           ]
-        hdf5_versions : [
-         1.10.4,
+        hdf5_version : [
+          1.10.4,
         ]
-        moab_versions : [
-         5.3.0,
+        moab_version : [
+          5.3.0,
         ]
-        double_down : [
-          OFF,
+        double_down_version : [
+          v1.1.0,
         ]
-        geant_version : [
+        geant4_version : [
           10.7.4,
           11.1.2
         ]
@@ -60,14 +60,14 @@ jobs:
       - name: Installing Dependencies in Docker image
         uses: firehed/multistage-docker-build-action@v1
         with:
-          repository: ghcr.io/${{ github.repository_owner }}/dagmc-ci-ubuntu-${{ matrix.ubuntu_versions }}-${{ matrix.compiler}}-geant4_${{ matrix.geant_version }}-hdf5_${{ matrix.hdf5_versions}}-moab_${{ matrix.moab_versions }}
+          repository: ghcr.io/${{ github.repository_owner }}/dagmc-ci-ubuntu-${{ matrix.ubuntu_version }}-${{ matrix.compiler}}-geant4_${{ matrix.geant4_version }}-hdf5_${{ matrix.hdf5_version}}-moab_${{ matrix.moab_version }}
           stages: base, external_deps, hdf5, moab, dagmc
           server-stage: dagmc_test
           quiet: false
           parallel: true
           tag-latest-on-default: ${{ env.tag-latest-on-default }}
           dockerfile: CI/Dockerfile
-          build-args: double_down=${{ matrix.double_down}}, geant4_version=${{ matrix.geant_version }}, COMPILER=${{ matrix.compiler }}, UBUNTU_VERSION=${{ matrix.ubuntu_versions }}, HDF5_VERSION=${{ matrix.hdf5_versions }}, MOAB_BRANCH=${{ matrix.moab_versions }}
+          build-args: DOUBLE_DOWN_VERSION=${{ matrix.double_down_version}}, Geant4_VERSION=${{ matrix.geant4_version }}, COMPILER=${{ matrix.compiler }}, UBUNTU_VERSION=${{ matrix.ubuntu_version }}, HDF5_VERSION=${{ matrix.hdf5_version }}, MOAB_VERSION=${{ matrix.moab_version }}
 
 
   push_stable_ci_img:
@@ -76,24 +76,24 @@ jobs:
 
     strategy:
       matrix:
-        ubuntu_versions : [
+        ubuntu_version : [
           20.04,
           22.04,
           ]
         compiler : [
           gcc,
           clang,
           ]
-        hdf5_versions : [
-         1.10.4,
+        hdf5_version : [
+          1.10.4,
         ]
-        moab_versions : [
-         5.3.0,
+        moab_version : [
+          5.3.0,
         ]
-        double_down : [
-          OFF,
+        double_down_version : [
+          v1.1.0,
         ]
-        geant_version : [
+        geant4_version : [
           10.7.4,
           11.1.2
         ]
@@ -111,7 +111,7 @@ jobs:
       - name: Store image name
         if: ${{ github.repository_owner == 'svalinn' }}
         run: |
-          echo "image_base_tag=ghcr.io/${{ github.repository_owner }}/dagmc-ci-ubuntu-${{ matrix.ubuntu_versions }}-${{ matrix.compiler }}-geant4_${{ matrix.geant_version }}-hdf5_${{ matrix.hdf5_versions }}-moab_${{ matrix.moab_versions }}" >> "$GITHUB_ENV"
+          echo "image_base_tag=ghcr.io/${{ github.repository_owner }}/dagmc-ci-ubuntu-${{ matrix.ubuntu_version }}-${{ matrix.compiler }}-geant4_${{ matrix.geant4_version }}-hdf5_${{ matrix.hdf5_version }}-moab_${{ matrix.moab_version }}" >> "$GITHUB_ENV"
 
       - name: Push Image as latest img
         if: ${{ github.repository_owner == 'svalinn' && github.ref == 'refs/heads/develop' }}

.github/workflows/linux_build_test.yml

@@ -36,29 +36,26 @@ jobs:
 
     strategy:
       matrix:
-        ubuntu_versions : [
+        ubuntu_version : [
           20.04,
           22.04,
           ]
         compiler : [
           gcc,
           clang,
-          ]
-        hdf5_versions : [
-         1.10.4,
         ]
-        moab_versions : [
-          5.3.0,
+        hdf5_version : [
+          1.10.4,
         ]
-        double_down : [
-          OFF,
+        moab_version : [
+          5.3.0,
         ]
         geant_version : [
           10.7.4,
         ]
 
     container:
-      image: ghcr.io/svalinn/dagmc-ci-ubuntu-${{ matrix.ubuntu_versions }}-${{ matrix.compiler}}-geant4_${{ matrix.geant_version }}-hdf5_${{ matrix.hdf5_versions}}-moab_${{ matrix.moab_versions }}/moab:latest
+      image: ghcr.io/svalinn/dagmc-ci-ubuntu-${{ matrix.ubuntu_version }}-${{ matrix.compiler}}-geant4_${{ matrix.geant_version }}-hdf5_${{ matrix.hdf5_version}}-moab_${{ matrix.moab_version }}/moab:latest
 
     steps:
       - name: Checkout repository
@@ -83,7 +80,7 @@ jobs:
               -DCMAKE_CXX_COMPILER=${CXX} \
               -DCMAKE_Fortran_COMPILER=gfortran \
               -DCMAKE_INSTALL_PREFIX=${install_dir}/dagmc \
-              -DDOUBLE_DOWN=${double_down} \
+              -DDOUBLE_DOWN=ON \
               -DCMAKE_CXX_FLAGS="-Werror=reorder" \
               -Ddd_ROOT=${double_down_install_dir} && \
           make -j2 && \

.github/workflows/linux_upstream_test_double_down.yml

@@ -1,4 +1,4 @@
-name: Test against Double Down on PR merge
+name: Test against newer Double Down on PR merge
 
 on:
   # allows us to run workflows manually
@@ -27,6 +27,4 @@ jobs:
         uses: ./.github/actions/upstream-test
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          double_down: ON
-
-
+          double_down_version: develop

.github/workflows/linux_upstream_test_geant4.yml

@@ -28,4 +28,3 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           geant_version: 11.1.2
-

.github/workflows/linux_upstream_test_moab.yml

@@ -1,4 +1,4 @@
-name: Test against MOAB master on PR merge
+name: Test against newer MOAB on PR merge
 
 on:
   # allows us to run workflows manually