From 96b51fc909573e9aeec8721227a8695164b9e79f Mon Sep 17 00:00:00 2001
From: Ahnaf Tahmid Chowdhury <ahnaf-tahmid@outlook.com>
Date: Thu, 29 Feb 2024 15:26:22 +0600
Subject: [PATCH 01/12] linux build test with updated docker images

---
 .github/workflows/docker_publish.yml   |  2 +-
 .github/workflows/linux_build_test.yml | 54 +++++++++++++++-----------
 2 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/docker_publish.yml b/.github/workflows/docker_publish.yml
index 64b2b6313..2a23b7c4a 100644
--- a/.github/workflows/docker_publish.yml
+++ b/.github/workflows/docker_publish.yml
@@ -1,4 +1,4 @@
-name: Build & Publish docker image for DAGMC-CI
+name: Build & Publish docker image
 
 on:
   # allows us to run workflows manually
diff --git a/.github/workflows/linux_build_test.yml b/.github/workflows/linux_build_test.yml
index e58aa9f82..29c339b5f 100644
--- a/.github/workflows/linux_build_test.yml
+++ b/.github/workflows/linux_build_test.yml
@@ -1,4 +1,4 @@
-name: Linux Build/Test for PR and collaborator push
+name: Linux Build/Test
 
 on:
   # allows us to run workflows manually
@@ -36,7 +36,7 @@ jobs:
 
     strategy:
       matrix:
-        ubuntu_versions : [
+        ubuntu_version : [
           20.04,
           22.04,
         ]
@@ -44,23 +44,36 @@ jobs:
           gcc,
           clang,
         ]
-        hdf5_versions : [
+        hdf5_version : [
           1.14.3,
         ]
-        moab_versions : [
+        moab_version : [
           5.4.1,
           5.5.1,
         ]
-        double_down : [
-          OFF,
-        ]
-        geant_version : [
+        geant4_version : [
           10.7.4,
           11.1.2
         ]
+        double_down_version : [
+          v1.1.0,
+        ]
 
     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
+        }}-hdf5_${{ 
+          matrix.hdf5_version
+        }}-moab_${{ 
+          matrix.moab_version 
+        }}-geant4_${{ 
+          matrix.geant4_version 
+        }}-double_down_${{ 
+          matrix.double_down_version 
+        }}:latest
 
     steps:
       - name: Checkout repository
@@ -70,12 +83,11 @@ jobs:
 
       - name: Building DAGMC
         run: |
-          ln -s $GITHUB_WORKSPACE /root/build_dir/DAGMC
-          mkdir -p ./build
-          cd ./build
-          git config --global --add safe.directory $GITHUB_WORKSPACE
-          cmake ../ -DMOAB_DIR=${moab_install_dir} \
-              -DBUILD_GEANT4=ON \
+          mkdir -p build
+          cd build
+          cmake ../ \
+              -DMOAB_DIR=${moab_install_dir} \
+              -DBUILD_GEANT4=$([ "${GEANT4_VERSION}" != "off" ] && echo "ON" || echo "OFF") \
               -DGEANT4_DIR=${geant4_install_dir} \
               -DBUILD_CI_TESTS=ON \
               -DBUILD_MW_REG_TESTS=OFF \
@@ -84,14 +96,12 @@ jobs:
               -DCMAKE_C_COMPILER=${CC} \
               -DCMAKE_CXX_COMPILER=${CXX} \
               -DCMAKE_Fortran_COMPILER=gfortran \
-              -DCMAKE_INSTALL_PREFIX=${install_dir}/dagmc \
-              -DDOUBLE_DOWN=${double_down} \
-              -DCMAKE_CXX_FLAGS="-Werror=reorder" \
-              -Ddd_ROOT=${double_down_install_dir} && \
-          make -j2 && \
+              -DCMAKE_INSTALL_PREFIX=${dagmc_install_dir} \
+              -DDOUBLE_DOWN=$([ "${DOUBLE_DOWN_VERSION}" != "off" ] && echo "ON" || echo "OFF") \
+              -Ddd_ROOT=${double_down_install_dir}
+          make -j${CI_JOBS}
           make install
 
       - name: Testing DAGMC
         run: |
-          cd $GITHUB_WORKSPACE/build
-          PATH=${install_dir}/dagmc/bin:${PATH} CTEST_OUTPUT_ON_FAILURE=1 make test
\ No newline at end of file
+          PATH=${dagmc_install_dir}/bin:${PATH} CTEST_OUTPUT_ON_FAILURE=1 make test
\ No newline at end of file

From c996feaeebf9862ef4e4423545e8ad3cc79f4b69 Mon Sep 17 00:00:00 2001
From: Ahnaf Tahmid Chowdhury <ahnaf-tahmid@outlook.com>
Date: Thu, 29 Feb 2024 15:47:09 +0600
Subject: [PATCH 02/12] fix tag

---
 .github/workflows/linux_build_test.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/linux_build_test.yml b/.github/workflows/linux_build_test.yml
index 29c339b5f..41eb69183 100644
--- a/.github/workflows/linux_build_test.yml
+++ b/.github/workflows/linux_build_test.yml
@@ -73,7 +73,7 @@ jobs:
           matrix.geant4_version 
         }}-double_down_${{ 
           matrix.double_down_version 
-        }}:latest
+        }}/moab:latest
 
     steps:
       - name: Checkout repository
@@ -96,7 +96,7 @@ jobs:
               -DCMAKE_C_COMPILER=${CC} \
               -DCMAKE_CXX_COMPILER=${CXX} \
               -DCMAKE_Fortran_COMPILER=gfortran \
-              -DCMAKE_INSTALL_PREFIX=${dagmc_install_dir} \
+              -DCMAKE_INSTALL_PREFIX=${install_dir}/dagmc \
               -DDOUBLE_DOWN=$([ "${DOUBLE_DOWN_VERSION}" != "off" ] && echo "ON" || echo "OFF") \
               -Ddd_ROOT=${double_down_install_dir}
           make -j${CI_JOBS}
@@ -104,4 +104,4 @@ jobs:
 
       - name: Testing DAGMC
         run: |
-          PATH=${dagmc_install_dir}/bin:${PATH} CTEST_OUTPUT_ON_FAILURE=1 make test
\ No newline at end of file
+          PATH=${install_dir}/dagmc/bin:${PATH} CTEST_OUTPUT_ON_FAILURE=1 make test
\ No newline at end of file

From cd5cf9a62ac7bb7e4c1ade65a453db711d40cc92 Mon Sep 17 00:00:00 2001
From: Ahnaf Tahmid Chowdhury <ahnaf-tahmid@outlook.com>
Date: Thu, 29 Feb 2024 16:07:31 +0600
Subject: [PATCH 03/12] Update linux build test to use updated docker images

---
 doc/CHANGELOG.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/CHANGELOG.rst b/doc/CHANGELOG.rst
index 5ee6d4609..ab2d8cf1d 100644
--- a/doc/CHANGELOG.rst
+++ b/doc/CHANGELOG.rst
@@ -14,7 +14,7 @@ Next version
   * Update MOAB to 5.5.1 from 5.3.0 (#939 #940)
   * Update README regarding OpenMC (#938)
   * Simplify Housekeeping Process for DAGMC (#943)
-  * Allow Double Down v1.1.0 Installation in Dockerfile (#929 #944)
+  * Allow Double Down v1.1.0 Installation in Dockerfile (#929 #944 #949)
   * Inline documentation improvements (#945)
 
 v3.2.3

From df45051b7927ddfbfebca0f0907eed2b5d2a73aa Mon Sep 17 00:00:00 2001
From: Ahnaf Tahmid Chowdhury <ahnaf-tahmid@outlook.com>
Date: Thu, 29 Feb 2024 16:21:12 +0600
Subject: [PATCH 04/12] single line

---
 .github/workflows/linux_build_test.yml | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/.github/workflows/linux_build_test.yml b/.github/workflows/linux_build_test.yml
index 41eb69183..44d773881 100644
--- a/.github/workflows/linux_build_test.yml
+++ b/.github/workflows/linux_build_test.yml
@@ -61,19 +61,7 @@ jobs:
 
     container:
       image: >
-        ghcr.io/svalinn/dagmc-ci-ubuntu-${{ 
-          matrix.ubuntu_version
-        }}-${{ 
-          matrix.compiler
-        }}-hdf5_${{ 
-          matrix.hdf5_version
-        }}-moab_${{ 
-          matrix.moab_version 
-        }}-geant4_${{ 
-          matrix.geant4_version 
-        }}-double_down_${{ 
-          matrix.double_down_version 
-        }}/moab:latest
+        ghcr.io/svalinn/dagmc-ci-ubuntu-${{ matrix.ubuntu_version }}-${{ matrix.compiler }}-hdf5_${{ matrix.hdf5_version }}-moab_${{ matrix.moab_version }}-geant4_${{ matrix.geant4_version }}-double_down_${{ matrix.double_down_version }}/moab:latest
 
     steps:
       - name: Checkout repository

From 742e86e9539a3ee96af79873037534b9246cfee8 Mon Sep 17 00:00:00 2001
From: Ahnaf Tahmid Chowdhury <ahnaf-tahmid@outlook.com>
Date: Thu, 29 Feb 2024 16:22:40 +0600
Subject: [PATCH 05/12] remove >

---
 .github/workflows/linux_build_test.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/linux_build_test.yml b/.github/workflows/linux_build_test.yml
index 44d773881..2ffaf483f 100644
--- a/.github/workflows/linux_build_test.yml
+++ b/.github/workflows/linux_build_test.yml
@@ -60,8 +60,7 @@ jobs:
         ]
 
     container:
-      image: >
-        ghcr.io/svalinn/dagmc-ci-ubuntu-${{ matrix.ubuntu_version }}-${{ matrix.compiler }}-hdf5_${{ matrix.hdf5_version }}-moab_${{ matrix.moab_version }}-geant4_${{ matrix.geant4_version }}-double_down_${{ 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 }}-geant4_${{ matrix.geant4_version }}-double_down_${{ matrix.double_down_version }}/moab:latest
 
     steps:
       - name: Checkout repository

From ef332dd72268ab3f71d68b949c89f17c7329ca3c Mon Sep 17 00:00:00 2001
From: Ahnaf Tahmid Chowdhury <ahnaf-tahmid@outlook.com>
Date: Thu, 29 Feb 2024 16:32:24 +0600
Subject: [PATCH 06/12] git config --global --add safe.directory
 ${GITHUB_WORKSPACE}

---
 .github/workflows/linux_build_test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/linux_build_test.yml b/.github/workflows/linux_build_test.yml
index 2ffaf483f..93c613d13 100644
--- a/.github/workflows/linux_build_test.yml
+++ b/.github/workflows/linux_build_test.yml
@@ -70,6 +70,7 @@ jobs:
 
       - name: Building DAGMC
         run: |
+          git config --global --add safe.directory ${GITHUB_WORKSPACE}
           mkdir -p build
           cd build
           cmake ../ \

From e0718522597101431691cee7d3b6957188c50080 Mon Sep 17 00:00:00 2001
From: Ahnaf Tahmid Chowdhury <ahnaf-tahmid@outlook.com>
Date: Thu, 29 Feb 2024 16:49:10 +0600
Subject: [PATCH 07/12] add env

---
 .github/workflows/linux_build_test.yml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/linux_build_test.yml b/.github/workflows/linux_build_test.yml
index 93c613d13..bf29140d6 100644
--- a/.github/workflows/linux_build_test.yml
+++ b/.github/workflows/linux_build_test.yml
@@ -59,8 +59,18 @@ jobs:
           v1.1.0,
         ]
 
+    env:
+      container_image: |
+        ghcr.io/svalinn/dagmc-ci-ubuntu-
+        ${{ matrix.ubuntu_version }}-
+        ${{ matrix.compiler }}-
+        hdf5_${{ matrix.hdf5_version }}-
+        moab_${{ matrix.moab_version }}-
+        geant4_${{ matrix.geant4_version }}-
+        double_down_${{ matrix.double_down_version }}/moab:latest
+
     container:
-      image: ghcr.io/svalinn/dagmc-ci-ubuntu-${{ matrix.ubuntu_version }}-${{ matrix.compiler }}-hdf5_${{ matrix.hdf5_version }}-moab_${{ matrix.moab_version }}-geant4_${{ matrix.geant4_version }}-double_down_${{ matrix.double_down_version }}/moab:latest
+      image: ${{ env.container_image }}
 
     steps:
       - name: Checkout repository
@@ -92,4 +102,5 @@ jobs:
 
       - name: Testing DAGMC
         run: |
+          cd ${GITHUB_WORKSPACE}/build
           PATH=${install_dir}/dagmc/bin:${PATH} CTEST_OUTPUT_ON_FAILURE=1 make test
\ No newline at end of file

From 71ea39ff4fff8056c6c2c09ee92e56b58e0b2445 Mon Sep 17 00:00:00 2001
From: Ahnaf Tahmid Chowdhury <ahnaf-tahmid@outlook.com>
Date: Thu, 29 Feb 2024 16:52:50 +0600
Subject: [PATCH 08/12] cd ${GITHUB_WORKSPACE}/build

---
 .github/workflows/linux_build_test.yml | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/.github/workflows/linux_build_test.yml b/.github/workflows/linux_build_test.yml
index bf29140d6..cb8727d5e 100644
--- a/.github/workflows/linux_build_test.yml
+++ b/.github/workflows/linux_build_test.yml
@@ -59,18 +59,8 @@ jobs:
           v1.1.0,
         ]
 
-    env:
-      container_image: |
-        ghcr.io/svalinn/dagmc-ci-ubuntu-
-        ${{ matrix.ubuntu_version }}-
-        ${{ matrix.compiler }}-
-        hdf5_${{ matrix.hdf5_version }}-
-        moab_${{ matrix.moab_version }}-
-        geant4_${{ matrix.geant4_version }}-
-        double_down_${{ matrix.double_down_version }}/moab:latest
-
     container:
-      image: ${{ env.container_image }}
+      image: ghcr.io/svalinn/dagmc-ci-ubuntu-${{ matrix.ubuntu_version }}-${{ matrix.compiler }}-hdf5_${{ matrix.hdf5_version }}-moab_${{ matrix.moab_version }}-geant4_${{ matrix.geant4_version }}-double_down_${{ matrix.double_down_version }}/moab:latest
 
     steps:
       - name: Checkout repository

From 366509638d5d44ee20191a78a2eca10ab77a6465 Mon Sep 17 00:00:00 2001
From: Ahnaf Tahmid Chowdhury <ahnaf-tahmid@outlook.com>
Date: Thu, 29 Feb 2024 19:22:54 +0600
Subject: [PATCH 09/12] remove spaces from image name

---
 .github/actions/upstream-test/action.yml | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/.github/actions/upstream-test/action.yml b/.github/actions/upstream-test/action.yml
index 8aa874092..26802f269 100644
--- a/.github/actions/upstream-test/action.yml
+++ b/.github/actions/upstream-test/action.yml
@@ -44,13 +44,21 @@ runs:
         uses: firehed/multistage-docker-build-action@v1
         with:
           repository: >
-            ghcr.io/${{ github.repository_owner }}/
-            dagmc-ci-ubuntu-${{ inputs.ubuntu_version }}
-            -${{ inputs.compiler}}
-            -hdf5_${{ inputs.hdf5_version}}
-            -moab_${{ inputs.moab_version }}
-            -geant4_${{ inputs.geant4_version }}
-            -double_down_${{ inputs.double_down_version }}
+            ghcr.io/${{
+              github.repository_owner
+            }}/dagmc-ci-ubuntu-${{
+              inputs.ubuntu_version
+            }}-${{
+              inputs.compiler
+            }}-hdf5_${{
+              inputs.hdf5_version
+            }}-moab_${{
+              inputs.moab_version
+            }}-geant4_${{
+              inputs.geant4_version
+            }}-double_down_${{
+              inputs.double_down_version
+            }}
           stages: base, external_deps, hdf5, moab, dagmc
           server-stage: dagmc_test
           quiet: false

From 5fa5a7f76e664a01ce5f5c70e3f84635adef4b14 Mon Sep 17 00:00:00 2001
From: Ahnaf Tahmid Chowdhury <ahnaf-tahmid@outlook.com>
Date: Thu, 29 Feb 2024 19:39:06 +0600
Subject: [PATCH 10/12] format without using '>'

---
 .github/workflows/linux_build_test.yml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/linux_build_test.yml b/.github/workflows/linux_build_test.yml
index cb8727d5e..72b440315 100644
--- a/.github/workflows/linux_build_test.yml
+++ b/.github/workflows/linux_build_test.yml
@@ -60,7 +60,19 @@ jobs:
         ]
 
     container:
-      image: ghcr.io/svalinn/dagmc-ci-ubuntu-${{ matrix.ubuntu_version }}-${{ matrix.compiler }}-hdf5_${{ matrix.hdf5_version }}-moab_${{ matrix.moab_version }}-geant4_${{ matrix.geant4_version }}-double_down_${{ 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 
+              }}-geant4_${{ 
+                matrix.geant4_version 
+              }}-double_down_${{ 
+                matrix.double_down_version 
+              }}/moab:latest
 
     steps:
       - name: Checkout repository

From 9bfc4b20af227d2823386904aa72991ef0b0c380 Mon Sep 17 00:00:00 2001
From: Ahnaf Tahmid Chowdhury <ahnaf-tahmid@outlook.com>
Date: Thu, 29 Feb 2024 22:51:26 +0600
Subject: [PATCH 11/12] add dd off

---
 .github/workflows/linux_build_test.yml | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/linux_build_test.yml b/.github/workflows/linux_build_test.yml
index 72b440315..df28b1a83 100644
--- a/.github/workflows/linux_build_test.yml
+++ b/.github/workflows/linux_build_test.yml
@@ -56,22 +56,23 @@ jobs:
           11.1.2
         ]
         double_down_version : [
+          off,
           v1.1.0,
         ]
 
     container:
-      image: ghcr.io/svalinn/dagmc-ci-ubuntu-${{ 
-                matrix.ubuntu_version 
-              }}-${{ 
-                matrix.compiler 
-              }}-hdf5_${{ 
-                matrix.hdf5_version 
-              }}-moab_${{ 
-                matrix.moab_version 
-              }}-geant4_${{ 
-                matrix.geant4_version 
-              }}-double_down_${{ 
-                matrix.double_down_version 
+      image: ghcr.io/svalinn/dagmc-ci-ubuntu-${{
+                matrix.ubuntu_version
+              }}-${{
+                matrix.compiler
+              }}-hdf5_${{
+                matrix.hdf5_version
+              }}-moab_${{
+                matrix.moab_version
+              }}-geant4_${{
+                matrix.geant4_version
+              }}-double_down_${{
+                matrix.double_down_version
               }}/moab:latest
 
     steps:

From 2ba589f755220b2e4b3eb3322d60c80d542c4afe Mon Sep 17 00:00:00 2001
From: Ahnaf Tahmid Chowdhury <ahnaf-tahmid@outlook.com>
Date: Thu, 29 Feb 2024 22:57:10 +0600
Subject: [PATCH 12/12] fix variables

---
 .github/workflows/linux_build_test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/linux_build_test.yml b/.github/workflows/linux_build_test.yml
index df28b1a83..383a2fd19 100644
--- a/.github/workflows/linux_build_test.yml
+++ b/.github/workflows/linux_build_test.yml
@@ -88,7 +88,7 @@ jobs:
           cd build
           cmake ../ \
               -DMOAB_DIR=${moab_install_dir} \
-              -DBUILD_GEANT4=$([ "${GEANT4_VERSION}" != "off" ] && echo "ON" || echo "OFF") \
+              -DBUILD_GEANT4=$([ "${{ matrix.geant4_version }}" != "off" ] && echo "ON" || echo "OFF") \
               -DGEANT4_DIR=${geant4_install_dir} \
               -DBUILD_CI_TESTS=ON \
               -DBUILD_MW_REG_TESTS=OFF \
@@ -98,7 +98,7 @@ jobs:
               -DCMAKE_CXX_COMPILER=${CXX} \
               -DCMAKE_Fortran_COMPILER=gfortran \
               -DCMAKE_INSTALL_PREFIX=${install_dir}/dagmc \
-              -DDOUBLE_DOWN=$([ "${DOUBLE_DOWN_VERSION}" != "off" ] && echo "ON" || echo "OFF") \
+              -DDOUBLE_DOWN=$([ "${{ matrix.double_down_version }}" != "off" ] && echo "ON" || echo "OFF") \
               -Ddd_ROOT=${double_down_install_dir}
           make -j${CI_JOBS}
           make install