From bd03bdb33be7153fdacd22db8df32c541f20cf97 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <bam.git.no.reply@gmail.com>
Date: Fri, 14 Feb 2025 12:16:32 +0100
Subject: [PATCH 1/8] propagating hdf5 version update to CI

---
 .github/actions/upstream-test/action.yml | 2 +-
 .github/workflows/linux_build_test.yml   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/actions/upstream-test/action.yml b/.github/actions/upstream-test/action.yml
index d0c36fbd9..24aa6b3e1 100644
--- 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: hdf5_1_14_3
+    default: 1.14.6
   moab_version:
     description: Version of MOAB
     required: false
diff --git a/.github/workflows/linux_build_test.yml b/.github/workflows/linux_build_test.yml
index ca90b76ff..ec4c5eda8 100644
--- a/.github/workflows/linux_build_test.yml
+++ b/.github/workflows/linux_build_test.yml
@@ -44,7 +44,7 @@ jobs:
           clang,
         ]
         hdf5_version : [
-          1.14.3,
+          1.14.6,
         ]
         moab_version : [
           5.4.1,
@@ -64,7 +64,7 @@ jobs:
         include:
           - ubuntu_version: 22.04
             compiler: gcc
-            hdf5_version: 1.14.3
+            hdf5_version: 1.14.6
             moab_version: 5.4.1
             pull_install_moab: on
             geant4_version: off

From 2df4b0656c039d7d22d55012a9640283faa23746 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <bam.git.no.reply@gmail.com>
Date: Fri, 14 Feb 2025 12:25:28 +0100
Subject: [PATCH 2/8] removing moab mention at the end of the container name

---
 .github/workflows/linux_build_test.yml | 2 +-
 doc/CHANGELOG.rst                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/linux_build_test.yml b/.github/workflows/linux_build_test.yml
index ec4c5eda8..c7e7faf79 100644
--- a/.github/workflows/linux_build_test.yml
+++ b/.github/workflows/linux_build_test.yml
@@ -83,7 +83,7 @@ jobs:
                 matrix.geant4_version
               }}-double_down_${{
                 matrix.double_down_version
-              }}/moab:latest
+              }}:latest
 
     steps:
       - name: Checkout repository
diff --git a/doc/CHANGELOG.rst b/doc/CHANGELOG.rst
index ce180fa3c..0c83eb5d2 100644
--- a/doc/CHANGELOG.rst
+++ b/doc/CHANGELOG.rst
@@ -9,7 +9,7 @@ Next version
 
 **Changed:**
   * Update formating of few files to comply with clang-format (#937)
-  * Update default HDF5 version to 1.14.6 (#976)
+  * Update default HDF5 version to 1.14.6 (#976, #978)
 
 **Added:**
   * Allow download & build of MOAB from cmake at build time (#969)

From 28258acd3ea0d42ba16ca33c50ee973e22abb04c Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <bam.git.no.reply@gmail.com>
Date: Fri, 14 Feb 2025 12:29:00 +0100
Subject: [PATCH 3/8] there is a v before geant4 version ref

---
 .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 c7e7faf79..f90499810 100644
--- a/.github/workflows/linux_build_test.yml
+++ b/.github/workflows/linux_build_test.yml
@@ -54,8 +54,8 @@ jobs:
           off,
         ]
         geant4_version : [
-          10.7.4,
-          11.1.2
+          v10.7.4,
+          v11.1.2
         ]
         double_down_version : [
           off,

From ecd48c68b2281cdf366d6c1a5341f3a889821233 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <bam.git.no.reply@gmail.com>
Date: Fri, 14 Feb 2025 12:31:18 +0100
Subject: [PATCH 4/8] updating geant4 version for proper match with what we
 build

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

diff --git a/.github/workflows/linux_build_test.yml b/.github/workflows/linux_build_test.yml
index f90499810..82b5e1bb6 100644
--- a/.github/workflows/linux_build_test.yml
+++ b/.github/workflows/linux_build_test.yml
@@ -55,7 +55,7 @@ jobs:
         ]
         geant4_version : [
           v10.7.4,
-          v11.1.2
+          v11.2.1
         ]
         double_down_version : [
           off,

From f696121d0d45468a3c8bda381f9743d3c42dfbf4 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <bam.git.no.reply@gmail.com>
Date: Fri, 14 Feb 2025 12:35:09 +0100
Subject: [PATCH 5/8] DOUBLE_DOWN_INSTALL_DIR back to capital

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

diff --git a/.github/workflows/linux_build_test.yml b/.github/workflows/linux_build_test.yml
index 82b5e1bb6..97af7c501 100644
--- a/.github/workflows/linux_build_test.yml
+++ b/.github/workflows/linux_build_test.yml
@@ -110,7 +110,7 @@ jobs:
               -DCMAKE_Fortran_COMPILER=gfortran \
               -DCMAKE_INSTALL_PREFIX=${install_dir}/dagmc \
               -DDOUBLE_DOWN=$([ "${{ matrix.double_down_version }}" != "off" ] && echo "ON" || echo "OFF") \
-              -Ddd_ROOT=${double_down_install_dir}
+              -Ddd_ROOT=${DOUBLE_DOWN_INSTALL_DIR}
           make -j${CI_JOBS}
           make install
 

From b5cd71bb23f8c0e0b0180b82560a97ac96e9f29c Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <bam.git.no.reply@gmail.com>
Date: Fri, 14 Feb 2025 12:37:15 +0100
Subject: [PATCH 6/8] readd missing caps for variable

---
 .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 97af7c501..658dc52b9 100644
--- a/.github/workflows/linux_build_test.yml
+++ b/.github/workflows/linux_build_test.yml
@@ -97,10 +97,10 @@ jobs:
           mkdir -p build
           cd build
           cmake ../ \
-              -DMOAB_DIR=${moab_install_dir} \
+              -DMOAB_DIR=${MOAB_INSTALL_DIR} \
               -DBUILD_GEANT4=$([ "${{ matrix.geant4_version }}" != "off" ] && echo "ON" || echo "OFF") \
-              -DPULL_INSTALL_MOAB=$([ "${{ matrix.pull_install_moab }}" != "on" ] && echo "OFF" || echo "ON -DHDF5_ROOT=${hdf5_install_dir}") \
-              -DGEANT4_DIR=${geant4_install_dir} \
+              -DPULL_INSTALL_MOAB=$([ "${{ matrix.pull_install_moab }}" != "on" ] && echo "OFF" || echo "ON -DHDF5_ROOT=${HDF5_INSTALL_DIR}") \
+              -DGEANT4_DIR=${GEANT4_INSTALL_DIR} \
               -DBUILD_CI_TESTS=ON \
               -DBUILD_MW_REG_TESTS=OFF \
               -DBUILD_STATIC_EXE=OFF \

From 3afd9f8c99edf86b82d5983954b0ec188923c562 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <bam.git.no.reply@gmail.com>
Date: Fri, 14 Feb 2025 15:28:10 +0100
Subject: [PATCH 7/8] reading the moab container in the name

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

diff --git a/.github/workflows/linux_build_test.yml b/.github/workflows/linux_build_test.yml
index 658dc52b9..98ea82240 100644
--- a/.github/workflows/linux_build_test.yml
+++ b/.github/workflows/linux_build_test.yml
@@ -83,7 +83,7 @@ jobs:
                 matrix.geant4_version
               }}-double_down_${{
                 matrix.double_down_version
-              }}:latest
+              }}/moab:latest
 
     steps:
       - name: Checkout repository

From 48b9cc4d8875e550a78b1e512c4fff30a099f169 Mon Sep 17 00:00:00 2001
From: Baptiste Mouginot <bam.git.no.reply@gmail.com>
Date: Fri, 14 Feb 2025 15:36:09 +0100
Subject: [PATCH 8/8] external_deps extension ?

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

diff --git a/.github/workflows/linux_build_test.yml b/.github/workflows/linux_build_test.yml
index 98ea82240..be4bdacdd 100644
--- a/.github/workflows/linux_build_test.yml
+++ b/.github/workflows/linux_build_test.yml
@@ -83,7 +83,7 @@ jobs:
                 matrix.geant4_version
               }}-double_down_${{
                 matrix.double_down_version
-              }}/moab:latest
+              }}/external_deps:latest
 
     steps:
       - name: Checkout repository