From 03c47d61f9c03a4b90eba07a9261cf0157e9edd8 Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Tue, 19 Nov 2024 16:38:11 -0700
Subject: [PATCH 01/23] Preparing for release candidate 2.

---
 RELEASE_NOTES.md | 2 +-
 configure.ac     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 7475de2d26..c4d1e8774a 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -15,7 +15,7 @@ This file contains a high-level description of this package's evolution. Release
 
 ## Release Notes
 
-### Release Candidate 2 - TBD
+### Release Candidate 2 - November 20, 2024
 
 > Note: To avoid a conflict between `_FillValue` and `libc++18`, we have introduced a new option, `--enable-legacy-macros` for autotools and `NETCDF_ENABLE_LEGACY_MACROS` for cmake.  These are turned on by default currently but will be turned off eventually.  Developers are encouraged to move away from the `FillValue` macro and replace it with the new `NC_FillValue` macro.  See [Github #2858](https://github.com/Unidata/netcdf-c/issues/2858) for more information. 
 
diff --git a/configure.ac b/configure.ac
index 89d04efebe..2f4b4a22ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AC_SUBST([NC_VERSION_NOTE]) NC_VERSION_NOTE="-development"
 # See http://www.gnu.org/software/libtool/manual/libtool.html#Libtool-versioning
 # for information regarding incrementing `-version-info`.
 # These values should match those in CMakeLists.txt
-AC_SUBST([netCDF_SO_VERSION]) netCDF_SO_VERSION=22:0:0
+AC_SUBST([netCDF_SO_VERSION]) netCDF_SO_VERSION=23:0:1
 
 #####
 # Set some variables used to generate a libnetcdf.settings file,

From 20427fede1f123ba650c455fffc2ff18e0965548 Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Thu, 21 Nov 2024 15:13:08 -0700
Subject: [PATCH 02/23] The echon implementation is hanging in an infinite
 loop, so reverting to 'echo -n' and observing what errors are observed on
 MacOS and Windows.

---
 test_common.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test_common.in b/test_common.in
index 5a3d1c29e9..97c4208b15 100644
--- a/test_common.in
+++ b/test_common.in
@@ -201,7 +201,8 @@ fi
 
 # OS/X and windows apparently have no echo -n option, so fake it
 echon() {
-    ${execdir}/../ncdump/echon -n $@
+    echo -n $@
+    #${execdir}/../ncdump/echon -n $@
 }
 
 # Test for filter availability

From 451cba565a2db71f4abad215bbf3adbbb88f3b52 Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Thu, 21 Nov 2024 15:13:26 -0700
Subject: [PATCH 03/23] Updated release notes.

---
 RELEASE_NOTES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index c4d1e8774a..fcc3491c5e 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -15,7 +15,7 @@ This file contains a high-level description of this package's evolution. Release
 
 ## Release Notes
 
-### Release Candidate 2 - November 20, 2024
+### Release Candidate 2 - November 22, 2024
 
 > Note: To avoid a conflict between `_FillValue` and `libc++18`, we have introduced a new option, `--enable-legacy-macros` for autotools and `NETCDF_ENABLE_LEGACY_MACROS` for cmake.  These are turned on by default currently but will be turned off eventually.  Developers are encouraged to move away from the `FillValue` macro and replace it with the new `NC_FillValue` macro.  See [Github #2858](https://github.com/Unidata/netcdf-c/issues/2858) for more information. 
 

From 57149a43e5aabfbddc2e2846af7aa59f6441b725 Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Fri, 22 Nov 2024 12:20:59 -0700
Subject: [PATCH 04/23] Attempting a different portable approach

---
 test_common.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test_common.in b/test_common.in
index 5a3d1c29e9..8786568768 100644
--- a/test_common.in
+++ b/test_common.in
@@ -201,7 +201,7 @@ fi
 
 # OS/X and windows apparently have no echo -n option, so fake it
 echon() {
-    ${execdir}/../ncdump/echon -n $@
+    echo $@ | tr -d '\n'
 }
 
 # Test for filter availability

From 901c004a388988f959a8ff963819d7a1dee96c7e Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Fri, 6 Dec 2024 14:14:42 -0700
Subject: [PATCH 05/23] Update release notes.

---
 RELEASE_NOTES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index fcc3491c5e..5759b335c1 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -15,7 +15,7 @@ This file contains a high-level description of this package's evolution. Release
 
 ## Release Notes
 
-### Release Candidate 2 - November 22, 2024
+### Release Candidate 2 - December 6, 2024
 
 > Note: To avoid a conflict between `_FillValue` and `libc++18`, we have introduced a new option, `--enable-legacy-macros` for autotools and `NETCDF_ENABLE_LEGACY_MACROS` for cmake.  These are turned on by default currently but will be turned off eventually.  Developers are encouraged to move away from the `FillValue` macro and replace it with the new `NC_FillValue` macro.  See [Github #2858](https://github.com/Unidata/netcdf-c/issues/2858) for more information. 
 

From d97588984450d47944326823dfafb888923a1263 Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Tue, 17 Dec 2024 16:03:10 -0700
Subject: [PATCH 06/23] Bump to later macOS for github actions.

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

diff --git a/.github/workflows/run_tests_osx.yml b/.github/workflows/run_tests_osx.yml
index 11f4bc734a..56a37293e2 100644
--- a/.github/workflows/run_tests_osx.yml
+++ b/.github/workflows/run_tests_osx.yml
@@ -16,7 +16,7 @@ jobs:
 
   build-deps-osx:
 
-    runs-on: macos-12
+    runs-on: macos-15
 
     strategy:
       matrix:
@@ -52,7 +52,7 @@ jobs:
   nc-autotools-osx:
 
     needs: [ nc-cmake-tests-oneoff-osx-shared, nc-cmake-tests-oneoff-osx-static, nc-ac-tests-oneoff-osx ]
-    runs-on: macos-12
+    runs-on: macos-15
 
     strategy:
       matrix:
@@ -158,7 +158,7 @@ jobs:
   nc-cmake-osx:
 
     needs: [ nc-cmake-tests-oneoff-osx-shared, nc-cmake-tests-oneoff-osx-static, nc-ac-tests-oneoff-osx ]
-    runs-on: macos-12
+    runs-on: macos-15
 
     strategy:
       matrix:
@@ -253,7 +253,7 @@ jobs:
   nc-ac-tests-oneoff-osx:
 
     needs: build-deps-osx
-    runs-on: macos-12
+    runs-on: macos-15
 
     strategy:
       matrix:
@@ -334,7 +334,7 @@ jobs:
   nc-cmake-tests-oneoff-osx-shared:
 
     needs: build-deps-osx
-    runs-on: macos-12
+    runs-on: macos-15
 
     strategy:
       matrix:
@@ -408,7 +408,7 @@ jobs:
   nc-cmake-tests-oneoff-osx-static:
 
     needs: build-deps-osx
-    runs-on: macos-12
+    runs-on: macos-15
 
     strategy:
       matrix:

From c24188c1516eb50ac24967588ea0b023206166be Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Tue, 17 Dec 2024 16:08:44 -0700
Subject: [PATCH 07/23] Modify number of processes used when compiling or
 running tests.

---
 .github/workflows/run_tests_osx.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/run_tests_osx.yml b/.github/workflows/run_tests_osx.yml
index 56a37293e2..f4b034ab72 100644
--- a/.github/workflows/run_tests_osx.yml
+++ b/.github/workflows/run_tests_osx.yml
@@ -230,21 +230,21 @@ jobs:
         shell: bash -l {0}
         run: |
           cd build
-          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} make -j 12
+          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} make -j $(nproc)
         if: ${{ success() }}
 
       - name: Run Tests
         shell: bash -l {0}
         run: |
           cd build
-          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ctest --verbose -j 12 .
+          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ctest --verbose -j $(nproc) .
         if: ${{ success() }}
 
       - name: Verbose Output if CTest Failure
         shell: bash -l {0}
         run: |
           cd build
-          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ctest -j 12 --rerun-failed --output-on-failure -VV
+          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ctest -j $(nproc) --rerun-failed --output-on-failure -VV
         if: ${{ failure() }}
 
   #####
@@ -387,21 +387,21 @@ jobs:
         shell: bash -l {0}
         run: |
           cd build
-          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} make -j 12
+          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} make -j $(nproc)
         if: ${{ success() }}
 
       - name: Run Tests
         shell: bash -l {0}
         run: |
           cd build
-          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ctest --output-on-failure -j 12 .
+          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ctest --output-on-failure -j $(nproc) .
         if: ${{ success() }}
 
       - name: Verbose Output if CTest Failure
         shell: bash -l {0}
         run: |
           cd build
-          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ctest -j 12 --rerun-failed --output-on-failure -VV
+          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ctest -j $(nproc) --rerun-failed --output-on-failure -VV
         if: ${{ failure() }}
 
 
@@ -462,19 +462,19 @@ jobs:
         shell: bash -l {0}
         run: |
           cd build
-          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} make -j 12
+          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} make -j $(nproc)
         if: ${{ success() }}
 
       - name: Run Tests
         shell: bash -l {0}
         run: |
           cd build
-          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ctest --output-on-failure -j 12 .
+          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ctest --output-on-failure -j $(nproc) .
         if: ${{ success() }}
 
       - name: Verbose Output if CTest Failure
         shell: bash -l {0}
         run: |
           cd build
-          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ctest -j 12 --rerun-failed --output-on-failure -VV
+          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ctest -j $(nproc) --rerun-failed --output-on-failure -VV
         if: ${{ failure() }}

From 3c69092d1551328fa0bf56f28f9828b674d80806 Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Tue, 17 Dec 2024 16:12:09 -0700
Subject: [PATCH 08/23] Revert one version for macos based Github Actions.

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

diff --git a/.github/workflows/run_tests_osx.yml b/.github/workflows/run_tests_osx.yml
index f4b034ab72..328e0c8e83 100644
--- a/.github/workflows/run_tests_osx.yml
+++ b/.github/workflows/run_tests_osx.yml
@@ -16,7 +16,7 @@ jobs:
 
   build-deps-osx:
 
-    runs-on: macos-15
+    runs-on: macos-14
 
     strategy:
       matrix:
@@ -52,7 +52,7 @@ jobs:
   nc-autotools-osx:
 
     needs: [ nc-cmake-tests-oneoff-osx-shared, nc-cmake-tests-oneoff-osx-static, nc-ac-tests-oneoff-osx ]
-    runs-on: macos-15
+    runs-on: macos-14
 
     strategy:
       matrix:
@@ -158,7 +158,7 @@ jobs:
   nc-cmake-osx:
 
     needs: [ nc-cmake-tests-oneoff-osx-shared, nc-cmake-tests-oneoff-osx-static, nc-ac-tests-oneoff-osx ]
-    runs-on: macos-15
+    runs-on: macos-14
 
     strategy:
       matrix:
@@ -253,7 +253,7 @@ jobs:
   nc-ac-tests-oneoff-osx:
 
     needs: build-deps-osx
-    runs-on: macos-15
+    runs-on: macos-14
 
     strategy:
       matrix:
@@ -334,7 +334,7 @@ jobs:
   nc-cmake-tests-oneoff-osx-shared:
 
     needs: build-deps-osx
-    runs-on: macos-15
+    runs-on: macos-14
 
     strategy:
       matrix:
@@ -408,7 +408,7 @@ jobs:
   nc-cmake-tests-oneoff-osx-static:
 
     needs: build-deps-osx
-    runs-on: macos-15
+    runs-on: macos-14
 
     strategy:
       matrix:

From 3f3b30a2d4ebdc94ec498b9f9009ed8701cb93c0 Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Tue, 17 Dec 2024 16:17:43 -0700
Subject: [PATCH 09/23] Correct a couple of missed unbounded compiling threads

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

diff --git a/.github/workflows/run_tests_osx.yml b/.github/workflows/run_tests_osx.yml
index 328e0c8e83..9373f73f2c 100644
--- a/.github/workflows/run_tests_osx.yml
+++ b/.github/workflows/run_tests_osx.yml
@@ -45,8 +45,8 @@ jobs:
           tar -jxf hdf5-${{ matrix.hdf5 }}.tar.bz2
           pushd hdf5-${{ matrix.hdf5 }}
           ./configure --disable-static --enable-shared --prefix=${HOME}/environments/${{ matrix.hdf5 }} --enable-hl --with-szlib
-          make -j
-          make install -j
+          make -j $(nproc)
+          make install -j $(nproc)
           popd
 
   nc-autotools-osx:

From a27cbc0a024b866441914cf264a92a334359ac93 Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Tue, 17 Dec 2024 16:21:38 -0700
Subject: [PATCH 10/23] Add a stanza for some error handling.

---
 .github/workflows/run_tests_osx.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/run_tests_osx.yml b/.github/workflows/run_tests_osx.yml
index 9373f73f2c..ce8f0bec92 100644
--- a/.github/workflows/run_tests_osx.yml
+++ b/.github/workflows/run_tests_osx.yml
@@ -49,6 +49,14 @@ jobs:
           make install -j $(nproc)
           popd
 
+      - name: Handle Error for libhdf5-${{ runner.os }}-${{ matrix.hdf5 }}
+        shell: bash -l {0}
+        run: | 
+          cat config.log
+          echo "Checking filesystem limits"
+          ulimit -a
+        if: ${{ failure() }}
+
   nc-autotools-osx:
 
     needs: [ nc-cmake-tests-oneoff-osx-shared, nc-cmake-tests-oneoff-osx-static, nc-ac-tests-oneoff-osx ]

From b423d7515fb04a940d09fea08bd4f02f40813830 Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Tue, 17 Dec 2024 16:25:23 -0700
Subject: [PATCH 11/23] Additional process checking.

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

diff --git a/.github/workflows/run_tests_osx.yml b/.github/workflows/run_tests_osx.yml
index ce8f0bec92..4cd5637064 100644
--- a/.github/workflows/run_tests_osx.yml
+++ b/.github/workflows/run_tests_osx.yml
@@ -55,6 +55,8 @@ jobs:
           cat config.log
           echo "Checking filesystem limits"
           ulimit -a
+          echo "Checking user process limits"
+          sysctl -a | grep maxproc
         if: ${{ failure() }}
 
   nc-autotools-osx:

From a4cce3eeaacb760d0ac0b3c65a74134b4f6b098f Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Tue, 17 Dec 2024 16:38:42 -0700
Subject: [PATCH 12/23] Reverted to current released macos version.

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

diff --git a/.github/workflows/run_tests_osx.yml b/.github/workflows/run_tests_osx.yml
index 4cd5637064..b66a12b59a 100644
--- a/.github/workflows/run_tests_osx.yml
+++ b/.github/workflows/run_tests_osx.yml
@@ -16,7 +16,7 @@ jobs:
 
   build-deps-osx:
 
-    runs-on: macos-14
+    runs-on: macos-13
 
     strategy:
       matrix:
@@ -62,7 +62,7 @@ jobs:
   nc-autotools-osx:
 
     needs: [ nc-cmake-tests-oneoff-osx-shared, nc-cmake-tests-oneoff-osx-static, nc-ac-tests-oneoff-osx ]
-    runs-on: macos-14
+    runs-on: macos-13
 
     strategy:
       matrix:
@@ -168,7 +168,7 @@ jobs:
   nc-cmake-osx:
 
     needs: [ nc-cmake-tests-oneoff-osx-shared, nc-cmake-tests-oneoff-osx-static, nc-ac-tests-oneoff-osx ]
-    runs-on: macos-14
+    runs-on: macos-13
 
     strategy:
       matrix:
@@ -263,7 +263,7 @@ jobs:
   nc-ac-tests-oneoff-osx:
 
     needs: build-deps-osx
-    runs-on: macos-14
+    runs-on: macos-13
 
     strategy:
       matrix:
@@ -344,7 +344,7 @@ jobs:
   nc-cmake-tests-oneoff-osx-shared:
 
     needs: build-deps-osx
-    runs-on: macos-14
+    runs-on: macos-13
 
     strategy:
       matrix:
@@ -418,7 +418,7 @@ jobs:
   nc-cmake-tests-oneoff-osx-static:
 
     needs: build-deps-osx
-    runs-on: macos-14
+    runs-on: macos-13
 
     strategy:
       matrix:

From b50be57596ea79ec9b3c635d144b6d70ecec80a4 Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Tue, 17 Dec 2024 16:51:13 -0700
Subject: [PATCH 13/23] More the fool me for assuming nproc would be available
 on the runners.

---
 .github/workflows/run_tests_osx.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/run_tests_osx.yml b/.github/workflows/run_tests_osx.yml
index b66a12b59a..bcf0e7c6e4 100644
--- a/.github/workflows/run_tests_osx.yml
+++ b/.github/workflows/run_tests_osx.yml
@@ -45,8 +45,8 @@ jobs:
           tar -jxf hdf5-${{ matrix.hdf5 }}.tar.bz2
           pushd hdf5-${{ matrix.hdf5 }}
           ./configure --disable-static --enable-shared --prefix=${HOME}/environments/${{ matrix.hdf5 }} --enable-hl --with-szlib
-          make -j $(nproc)
-          make install -j $(nproc)
+          make -j 12
+          make install -j 12
           popd
 
       - name: Handle Error for libhdf5-${{ runner.os }}-${{ matrix.hdf5 }}
@@ -240,21 +240,21 @@ jobs:
         shell: bash -l {0}
         run: |
           cd build
-          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} make -j $(nproc)
+          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} make -j 12
         if: ${{ success() }}
 
       - name: Run Tests
         shell: bash -l {0}
         run: |
           cd build
-          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ctest --verbose -j $(nproc) .
+          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ctest --verbose -j 12 .
         if: ${{ success() }}
 
       - name: Verbose Output if CTest Failure
         shell: bash -l {0}
         run: |
           cd build
-          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ctest -j $(nproc) --rerun-failed --output-on-failure -VV
+          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ctest -j 12 --rerun-failed --output-on-failure -VV
         if: ${{ failure() }}
 
   #####
@@ -397,21 +397,21 @@ jobs:
         shell: bash -l {0}
         run: |
           cd build
-          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} make -j $(nproc)
+          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} make -j 12
         if: ${{ success() }}
 
       - name: Run Tests
         shell: bash -l {0}
         run: |
           cd build
-          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ctest --output-on-failure -j $(nproc) .
+          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ctest --output-on-failure -j 12 .
         if: ${{ success() }}
 
       - name: Verbose Output if CTest Failure
         shell: bash -l {0}
         run: |
           cd build
-          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ctest -j $(nproc) --rerun-failed --output-on-failure -VV
+          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ctest -j 12 --rerun-failed --output-on-failure -VV
         if: ${{ failure() }}
 
 
@@ -472,19 +472,19 @@ jobs:
         shell: bash -l {0}
         run: |
           cd build
-          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} make -j $(nproc)
+          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} make -j 12
         if: ${{ success() }}
 
       - name: Run Tests
         shell: bash -l {0}
         run: |
           cd build
-          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ctest --output-on-failure -j $(nproc) .
+          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ctest --output-on-failure -j 12 .
         if: ${{ success() }}
 
       - name: Verbose Output if CTest Failure
         shell: bash -l {0}
         run: |
           cd build
-          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ctest -j $(nproc) --rerun-failed --output-on-failure -VV
+          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ctest -j 12 --rerun-failed --output-on-failure -VV
         if: ${{ failure() }}

From f81ce2bb330c77a335807c92a46008fee046a954 Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Tue, 17 Dec 2024 17:20:23 -0700
Subject: [PATCH 14/23] Tweak parallel processors for ubuntu-based tests.

---
 .github/workflows/run_tests_ubuntu.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/run_tests_ubuntu.yml b/.github/workflows/run_tests_ubuntu.yml
index 3ec6a595cd..3c57a3a21a 100644
--- a/.github/workflows/run_tests_ubuntu.yml
+++ b/.github/workflows/run_tests_ubuntu.yml
@@ -375,17 +375,17 @@ jobs:
 
       - name: Build Library and Utilities
         shell: bash -l {0}
-        run: CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} CC=mpicc make -j
+        run: CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} CC=mpicc make -j 4
         if: ${{ success() }}
 
       - name: Build Tests
         shell: bash -l {0}
-        run: CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} CC=mpicc make check TESTS="" -j
+        run: CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} CC=mpicc make check TESTS="" -j 4
         if: ${{ success() }}
 
       - name: Run Tests
         shell: bash -l {0}
-        run: CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} CC=mpicc make check -j
+        run: CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} CC=mpicc make check -j 4
         if: ${{ success() }}
 
 
@@ -462,14 +462,14 @@ jobs:
         shell: bash -l {0}
         run: |
           cd build
-          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ctest --output-on-failure -j 12 .
+          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ctest --output-on-failure -j 4 .
         if: ${{ success() }}
 
       - name: Verbose Output if CTest Failure
         shell: bash -l {0}
         run: |
           cd build
-          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ctest -j 12 --rerun-failed --output-on-failure -VV
+          LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ctest -j 4 --rerun-failed --output-on-failure -VV
         if: ${{ failure() }}
 
  ##

From f17163b68ddfd509ec0fb96d4753b787d8aaf6dd Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Wed, 18 Dec 2024 15:44:50 -0700
Subject: [PATCH 15/23] Testing a new scheme to allow downloading newer hdf5
 without breaking older versions.

---
 .github/workflows/run_tests_ubuntu.yml | 113 +++++++++++++++++++++++--
 1 file changed, 105 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/run_tests_ubuntu.yml b/.github/workflows/run_tests_ubuntu.yml
index 3c57a3a21a..13d475f77d 100644
--- a/.github/workflows/run_tests_ubuntu.yml
+++ b/.github/workflows/run_tests_ubuntu.yml
@@ -53,15 +53,65 @@ jobs:
           make -j
           make install -j
           popd
-
-          wget https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-$(echo ${{ matrix.hdf5 }} | cut -d. -f 1,2)/hdf5-${{ matrix.hdf5 }}/src/hdf5-${{ matrix.hdf5 }}.tar.bz2
-          tar -jxf hdf5-${{ matrix.hdf5 }}.tar.bz2
-          pushd hdf5-${{ matrix.hdf5 }}
+    
+          ##
+          # Begin convoluted failover for downloading hdf5,
+          # based on inconsistencies in naming conventions and download locations.
+          ##
+
+          H5VER=${{ matrix.hdf5 }}
+          H5MAJ=$(echo $H5VER | cut -d '.' -f 1)
+          H5MIN=$(echo $H5VER | cut -d '.' -f 2)
+          H5REV=$(echo $H5VER | cut -d '.' -f 3)
+          H5DIR="hdf5-${H5VER}${H5VERSUFFIX}-${{ runner.os }}"
+          H5DIR_ALT="hdf5_${H5VER}${H5VERSUFFIX}"
+          H5FILE="${H5DIR}.tar.bz2"
+          H5FILEGZ="${H5DIR}.tar.gz"
+          H5FILEGZ_ALT="${H5DIR_ALT}.tar.gz"
+
+
+          H5URL_DIRECT="https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${H5MAJ}.${H5MIN}/hdf5-${H5VER}/src/${H5FILE}"
+          H5URL_DIRECT_GZ="https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${H5MAJ}.${H5MIN}/hdf5-${H5VER}/src/${H5FILEGZ}"
+          H5URL_GITHUB="https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5-${H5MAJ}.${H5MIN}.${H5REV}${H5VERSUFFIX}.tar.gz"
+          H5URL_GITHUB_ALT="https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5_${H5MAJ}.${H5MIN}.${H5REV}${H5VERSUFFIX}.tar.gz"
+
+          SC=2
+          SCFLAG="-zxf"
+          H5FILENAME=${H5FILE}
+
+          wget "${H5URL_DIRECT}" ; FILEGOT=$?
+          if [ ${FILEGOT} -eq 0 ]; then
+            SCFLAG="-jxf"
+            H5FILENAME=${H5FILE}
+          else
+            wget "${H5URL_DIRECT_GZ}" ; FILEGOT=$?
+            if [ ${FILEGOT} -eq 0 ]; then
+              H5FILENAME=${H5FILEGZ}
+            else
+              wget "${H5URL_GITHUB}" ; FILEGOT=$?
+              if [ ${FILEGOT} -eq 0 ]; then
+                H5FILENAME="${H5FILEGZ}"
+                SC=1
+              else
+                wget "${H5URL_GITHUB_ALT}" ; FILEGOT=$?
+                if [ ${FILEGOT} -eq 0 ]; then
+                  H5FILENAME=${H5FILEGZ_ALT}
+                  SC=1
+                fi
+              fi
+            fi
+          fi
+          H5FILE=${H5FILENAME}
+          tar ${SCFLAG} ${H5FILE} -C $(pwd)/${H5DIR} --strip-components=${SC}
+          pushd ${H5DIR}
           ./configure --disable-static --enable-shared --prefix=${HOME}/environments/${{ matrix.hdf5 }} --enable-hl --with-szlib
           make -j
           make install -j
           popd
           
+          ##
+          # End convoluted HDF5 download failover
+          ##
 
   build-deps-parallel:
 
@@ -102,10 +152,57 @@ jobs:
           make -j
           make install -j
           popd
-
-          wget https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-$(echo ${{ matrix.hdf5 }} | cut -d. -f 1,2)/hdf5-${{ matrix.hdf5 }}/src/hdf5-${{ matrix.hdf5 }}.tar.bz2
-          tar -jxf hdf5-${{ matrix.hdf5 }}.tar.bz2
-          pushd hdf5-${{ matrix.hdf5 }}
+          ##
+          # Begin convoluted failover for downloading hdf5,
+          # based on inconsistencies in naming conventions and download locations.
+          ##
+
+          H5VER=${{ matrix.hdf5 }}
+          H5MAJ=$(echo $H5VER | cut -d '.' -f 1)
+          H5MIN=$(echo $H5VER | cut -d '.' -f 2)
+          H5REV=$(echo $H5VER | cut -d '.' -f 3)
+          H5DIR="hdf5-${H5VER}${H5VERSUFFIX}-${{ runner.os }}"
+          H5DIR_ALT="hdf5_${H5VER}${H5VERSUFFIX}"
+          H5FILE="${H5DIR}.tar.bz2"
+          H5FILEGZ="${H5DIR}.tar.gz"
+          H5FILEGZ_ALT="${H5DIR_ALT}.tar.gz"
+
+
+          H5URL_DIRECT="https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${H5MAJ}.${H5MIN}/hdf5-${H5VER}/src/${H5FILE}"
+          H5URL_DIRECT_GZ="https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${H5MAJ}.${H5MIN}/hdf5-${H5VER}/src/${H5FILEGZ}"
+          H5URL_GITHUB="https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5-${H5MAJ}.${H5MIN}.${H5REV}${H5VERSUFFIX}.tar.gz"
+          H5URL_GITHUB_ALT="https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5_${H5MAJ}.${H5MIN}.${H5REV}${H5VERSUFFIX}.tar.gz"
+
+          SC=2
+          SCFLAG="-zxf"
+          H5FILENAME=${H5FILE}
+
+          wget "${H5URL_DIRECT}" ; FILEGOT=$?
+          if [ ${FILEGOT} -eq 0 ]; then
+            SCFLAG="-jxf"
+            H5FILENAME=${H5FILE}
+          else
+            wget "${H5URL_DIRECT_GZ}" ; FILEGOT=$?
+            if [ ${FILEGOT} -eq 0 ]; then
+              H5FILENAME=${H5FILEGZ}
+            else
+              wget "${H5URL_GITHUB}" ; FILEGOT=$?
+              if [ ${FILEGOT} -eq 0 ]; then
+                H5FILENAME="${H5FILEGZ}"
+                SC=1
+              else
+                wget "${H5URL_GITHUB_ALT}" ; FILEGOT=$?
+                if [ ${FILEGOT} -eq 0 ]; then
+                  H5FILENAME=${H5FILEGZ_ALT}
+                  SC=1
+                fi
+              fi
+            fi
+          fi
+          H5FILE=${H5FILENAME}
+          tar ${SCFLAG} ${H5FILE} -C $(pwd)/${H5DIR} --strip-components=${SC}
+          pushd ${H5DIR}
+          ./configure --disable-static --enable-shared --pre
           CC=mpicc ./configure --disable-static --enable-shared --prefix=${HOME}/environments/${{ matrix.hdf5 }} --enable-hl --with-szlib --enable-parallel
           make -j
           make install -j

From 1eb356f75c677368ee4cc226b83483c05acb02db Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Wed, 18 Dec 2024 15:49:31 -0700
Subject: [PATCH 16/23] Bump hdf5 to 1.14.5

---
 .github/workflows/run_tests_ubuntu.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/run_tests_ubuntu.yml b/.github/workflows/run_tests_ubuntu.yml
index 13d475f77d..2db3d9f41c 100644
--- a/.github/workflows/run_tests_ubuntu.yml
+++ b/.github/workflows/run_tests_ubuntu.yml
@@ -21,7 +21,7 @@ jobs:
 
     strategy:
       matrix:
-        hdf5: [ 1.10.8, 1.12.2, 1.14.3 ]
+        hdf5: [ 1.10.8, 1.12.2, 1.14.5 ]
 
     steps:
       - uses: actions/checkout@v4
@@ -119,7 +119,7 @@ jobs:
 
     strategy:
       matrix:
-        hdf5: [ 1.14.3 ]
+        hdf5: [ 1.14.5 ]
 
     steps:
 
@@ -228,7 +228,7 @@ jobs:
 
     strategy:
       matrix:
-        hdf5: [ 1.14.3 ]
+        hdf5: [ 1.14.5 ]
     steps:
 
       - uses: actions/checkout@v4
@@ -323,7 +323,7 @@ jobs:
 
     strategy:
       matrix:
-        hdf5: [ 1.14.3 ]
+        hdf5: [ 1.14.5 ]
     steps:
 
       - uses: actions/checkout@v4
@@ -419,7 +419,7 @@ jobs:
 
     strategy:
       matrix:
-        hdf5: [ 1.14.3 ]
+        hdf5: [ 1.14.5 ]
     steps:
 
       - uses: actions/checkout@v4
@@ -499,7 +499,7 @@ jobs:
 
     strategy:
       matrix:
-        hdf5: [ 1.14.3 ]
+        hdf5: [ 1.14.5 ]
 
     steps:
 
@@ -579,7 +579,7 @@ jobs:
 
     strategy:
       matrix:
-        hdf5: [ 1.14.3 ]
+        hdf5: [ 1.14.5 ]
 
     steps:
 
@@ -661,7 +661,7 @@ jobs:
 
     strategy:
       matrix:
-        hdf5: [ 1.14.3 ]
+        hdf5: [ 1.14.5 ]
 
     steps:
 
@@ -738,7 +738,7 @@ jobs:
 
     strategy:
       matrix:
-        hdf5: [1.10.8, 1.12.2, 1.14.3 ]
+        hdf5: [1.10.8, 1.12.2, 1.14.5 ]
         use_nc4: [ nc3, nc4 ]
         use_dap: [ dap_off, dap_on ]
         use_nczarr: [ nczarr_off, nczarr_on ]
@@ -902,7 +902,7 @@ jobs:
 
     strategy:
       matrix:
-        hdf5: [ 1.10.8, 1.12.2, 1.14.3 ]
+        hdf5: [ 1.10.8, 1.12.2, 1.14.5 ]
         use_nc4: [ nc3, nc4 ]
         use_dap: [ dap_off, dap_on ]
         use_nczarr: [ nczarr_off, nczarr_on ]

From eaa3534b14e8144a4364bd8b3664f7c50b1fb2b4 Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Wed, 18 Dec 2024 15:52:44 -0700
Subject: [PATCH 17/23] Temporarily ignore errors.

---
 .github/workflows/run_tests_ubuntu.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/run_tests_ubuntu.yml b/.github/workflows/run_tests_ubuntu.yml
index 2db3d9f41c..25ef6ebde9 100644
--- a/.github/workflows/run_tests_ubuntu.yml
+++ b/.github/workflows/run_tests_ubuntu.yml
@@ -45,7 +45,7 @@ jobs:
         if: steps.cache-hdf5.outputs.cache-hit != 'true'
         run: |
           set -x
-
+          set +e
           wget https://support.hdfgroup.org/ftp/HDF/releases/HDF4.2.15/src/hdf-4.2.15.tar.bz2
           tar -jxf hdf-4.2.15.tar.bz2
           pushd hdf-4.2.15
@@ -112,6 +112,7 @@ jobs:
           ##
           # End convoluted HDF5 download failover
           ##
+          set -e
 
   build-deps-parallel:
 
@@ -144,6 +145,7 @@ jobs:
         if: steps.cache-hdf5.outputs.cache-hit != 'true'
         run: |
           set -x
+          set +e
 
           wget https://support.hdfgroup.org/ftp/HDF/releases/HDF4.2.15/src/hdf-4.2.15.tar.bz2
           tar -jxf hdf-4.2.15.tar.bz2
@@ -214,6 +216,7 @@ jobs:
           make -j
           make install -j
           popd
+          set -e
           
   #####
   # One-Off Autotools-based tests.

From 5d0840f75543dc410b6e8a7b43dfbee7a9ff6c96 Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Wed, 18 Dec 2024 15:57:39 -0700
Subject: [PATCH 18/23] Correct for missing directory

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

diff --git a/.github/workflows/run_tests_ubuntu.yml b/.github/workflows/run_tests_ubuntu.yml
index 25ef6ebde9..a74379c7bc 100644
--- a/.github/workflows/run_tests_ubuntu.yml
+++ b/.github/workflows/run_tests_ubuntu.yml
@@ -102,6 +102,7 @@ jobs:
             fi
           fi
           H5FILE=${H5FILENAME}
+          mkdir -p $(pwd)/${H5DIR}
           tar ${SCFLAG} ${H5FILE} -C $(pwd)/${H5DIR} --strip-components=${SC}
           pushd ${H5DIR}
           ./configure --disable-static --enable-shared --prefix=${HOME}/environments/${{ matrix.hdf5 }} --enable-hl --with-szlib
@@ -202,6 +203,7 @@ jobs:
             fi
           fi
           H5FILE=${H5FILENAME}
+          mkdir -p $(pwd)/${H5DIR}
           tar ${SCFLAG} ${H5FILE} -C $(pwd)/${H5DIR} --strip-components=${SC}
           pushd ${H5DIR}
           ./configure --disable-static --enable-shared --pre

From e97c08fb0b50d9aa93f5a79c2b511ba5c1179f08 Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Wed, 18 Dec 2024 16:17:57 -0700
Subject: [PATCH 19/23] A more reasonable, simpler approach

---
 .github/workflows/run_tests_ubuntu.yml | 119 ++++---------------------
 1 file changed, 15 insertions(+), 104 deletions(-)

diff --git a/.github/workflows/run_tests_ubuntu.yml b/.github/workflows/run_tests_ubuntu.yml
index a74379c7bc..91df6b20e8 100644
--- a/.github/workflows/run_tests_ubuntu.yml
+++ b/.github/workflows/run_tests_ubuntu.yml
@@ -54,66 +54,19 @@ jobs:
           make install -j
           popd
     
-          ##
-          # Begin convoluted failover for downloading hdf5,
-          # based on inconsistencies in naming conventions and download locations.
-          ##
-
-          H5VER=${{ matrix.hdf5 }}
-          H5MAJ=$(echo $H5VER | cut -d '.' -f 1)
-          H5MIN=$(echo $H5VER | cut -d '.' -f 2)
-          H5REV=$(echo $H5VER | cut -d '.' -f 3)
-          H5DIR="hdf5-${H5VER}${H5VERSUFFIX}-${{ runner.os }}"
-          H5DIR_ALT="hdf5_${H5VER}${H5VERSUFFIX}"
-          H5FILE="${H5DIR}.tar.bz2"
-          H5FILEGZ="${H5DIR}.tar.gz"
-          H5FILEGZ_ALT="${H5DIR_ALT}.tar.gz"
-
-
-          H5URL_DIRECT="https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${H5MAJ}.${H5MIN}/hdf5-${H5VER}/src/${H5FILE}"
-          H5URL_DIRECT_GZ="https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${H5MAJ}.${H5MIN}/hdf5-${H5VER}/src/${H5FILEGZ}"
-          H5URL_GITHUB="https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5-${H5MAJ}.${H5MIN}.${H5REV}${H5VERSUFFIX}.tar.gz"
-          H5URL_GITHUB_ALT="https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5_${H5MAJ}.${H5MIN}.${H5REV}${H5VERSUFFIX}.tar.gz"
-
-          SC=2
-          SCFLAG="-zxf"
-          H5FILENAME=${H5FILE}
-
-          wget "${H5URL_DIRECT}" ; FILEGOT=$?
-          if [ ${FILEGOT} -eq 0 ]; then
-            SCFLAG="-jxf"
-            H5FILENAME=${H5FILE}
+          if [ "${{ matrix.hdf5 }}" = "1.14.5" ]; then
+            wget https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5_1.14.5.tar.gz
+            tar -zxf hdf5_1.14.5.tar.gz
+            mv hdf5_1.14.5 hdf5-1.14.5
           else
-            wget "${H5URL_DIRECT_GZ}" ; FILEGOT=$?
-            if [ ${FILEGOT} -eq 0 ]; then
-              H5FILENAME=${H5FILEGZ}
-            else
-              wget "${H5URL_GITHUB}" ; FILEGOT=$?
-              if [ ${FILEGOT} -eq 0 ]; then
-                H5FILENAME="${H5FILEGZ}"
-                SC=1
-              else
-                wget "${H5URL_GITHUB_ALT}" ; FILEGOT=$?
-                if [ ${FILEGOT} -eq 0 ]; then
-                  H5FILENAME=${H5FILEGZ_ALT}
-                  SC=1
-                fi
-              fi
-            fi
+            wget https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-$(echo ${{ matrix.hdf5 }} | cut -d. -f 1,2)/hdf5-${{ matrix.hdf5 }}/src/hdf5-${{ matrix.hdf5 }}.tar.bz2
+            tar -jxf hdf5-${{ matrix.hdf5 }}.tar.bz2
           fi
-          H5FILE=${H5FILENAME}
-          mkdir -p $(pwd)/${H5DIR}
-          tar ${SCFLAG} ${H5FILE} -C $(pwd)/${H5DIR} --strip-components=${SC}
-          pushd ${H5DIR}
+          pushd hdf5-${{ matrix.hdf5 }}
           ./configure --disable-static --enable-shared --prefix=${HOME}/environments/${{ matrix.hdf5 }} --enable-hl --with-szlib
           make -j
           make install -j
           popd
-          
-          ##
-          # End convoluted HDF5 download failover
-          ##
-          set -e
 
   build-deps-parallel:
 
@@ -155,58 +108,16 @@ jobs:
           make -j
           make install -j
           popd
-          ##
-          # Begin convoluted failover for downloading hdf5,
-          # based on inconsistencies in naming conventions and download locations.
-          ##
-
-          H5VER=${{ matrix.hdf5 }}
-          H5MAJ=$(echo $H5VER | cut -d '.' -f 1)
-          H5MIN=$(echo $H5VER | cut -d '.' -f 2)
-          H5REV=$(echo $H5VER | cut -d '.' -f 3)
-          H5DIR="hdf5-${H5VER}${H5VERSUFFIX}-${{ runner.os }}"
-          H5DIR_ALT="hdf5_${H5VER}${H5VERSUFFIX}"
-          H5FILE="${H5DIR}.tar.bz2"
-          H5FILEGZ="${H5DIR}.tar.gz"
-          H5FILEGZ_ALT="${H5DIR_ALT}.tar.gz"
-
-
-          H5URL_DIRECT="https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${H5MAJ}.${H5MIN}/hdf5-${H5VER}/src/${H5FILE}"
-          H5URL_DIRECT_GZ="https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${H5MAJ}.${H5MIN}/hdf5-${H5VER}/src/${H5FILEGZ}"
-          H5URL_GITHUB="https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5-${H5MAJ}.${H5MIN}.${H5REV}${H5VERSUFFIX}.tar.gz"
-          H5URL_GITHUB_ALT="https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5_${H5MAJ}.${H5MIN}.${H5REV}${H5VERSUFFIX}.tar.gz"
-
-          SC=2
-          SCFLAG="-zxf"
-          H5FILENAME=${H5FILE}
-
-          wget "${H5URL_DIRECT}" ; FILEGOT=$?
-          if [ ${FILEGOT} -eq 0 ]; then
-            SCFLAG="-jxf"
-            H5FILENAME=${H5FILE}
+                    if [ "${{ matrix.hdf5 }}" = "1.14.5" ]; then
+            wget https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5_1.14.5.tar.gz
+            tar -zxf hdf5_1.14.5.tar.gz
+            mv hdf5_1.14.5 hdf5-1.14.5
           else
-            wget "${H5URL_DIRECT_GZ}" ; FILEGOT=$?
-            if [ ${FILEGOT} -eq 0 ]; then
-              H5FILENAME=${H5FILEGZ}
-            else
-              wget "${H5URL_GITHUB}" ; FILEGOT=$?
-              if [ ${FILEGOT} -eq 0 ]; then
-                H5FILENAME="${H5FILEGZ}"
-                SC=1
-              else
-                wget "${H5URL_GITHUB_ALT}" ; FILEGOT=$?
-                if [ ${FILEGOT} -eq 0 ]; then
-                  H5FILENAME=${H5FILEGZ_ALT}
-                  SC=1
-                fi
-              fi
-            fi
+            wget https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-$(echo ${{ matrix.hdf5 }} | cut -d. -f 1,2)/hdf5-${{ matrix.hdf5 }}/src/hdf5-${{ matrix.hdf5 }}.tar.bz2
+            tar -jxf hdf5-${{ matrix.hdf5 }}.tar.bz2
           fi
-          H5FILE=${H5FILENAME}
-          mkdir -p $(pwd)/${H5DIR}
-          tar ${SCFLAG} ${H5FILE} -C $(pwd)/${H5DIR} --strip-components=${SC}
-          pushd ${H5DIR}
-          ./configure --disable-static --enable-shared --pre
+
+          pushd hdf5-${{ matrix.hdf5 }}
           CC=mpicc ./configure --disable-static --enable-shared --prefix=${HOME}/environments/${{ matrix.hdf5 }} --enable-hl --with-szlib --enable-parallel
           make -j
           make install -j

From 4a3724bf6cb05c0d230c3d46400f87de69c9c56d Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Wed, 18 Dec 2024 16:25:03 -0700
Subject: [PATCH 20/23] Allow error catching.

---
 .github/workflows/run_tests_ubuntu.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/run_tests_ubuntu.yml b/.github/workflows/run_tests_ubuntu.yml
index 91df6b20e8..00ea58698d 100644
--- a/.github/workflows/run_tests_ubuntu.yml
+++ b/.github/workflows/run_tests_ubuntu.yml
@@ -45,7 +45,6 @@ jobs:
         if: steps.cache-hdf5.outputs.cache-hit != 'true'
         run: |
           set -x
-          set +e
           wget https://support.hdfgroup.org/ftp/HDF/releases/HDF4.2.15/src/hdf-4.2.15.tar.bz2
           tar -jxf hdf-4.2.15.tar.bz2
           pushd hdf-4.2.15
@@ -99,7 +98,6 @@ jobs:
         if: steps.cache-hdf5.outputs.cache-hit != 'true'
         run: |
           set -x
-          set +e
 
           wget https://support.hdfgroup.org/ftp/HDF/releases/HDF4.2.15/src/hdf-4.2.15.tar.bz2
           tar -jxf hdf-4.2.15.tar.bz2
@@ -129,7 +127,6 @@ jobs:
           make -j
           make install -j
           popd
-          set -e
           
   #####
   # One-Off Autotools-based tests.

From e4bb2cc7e88a088ec3bedb5b7e74c30d2565bdac Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Wed, 18 Dec 2024 16:33:34 -0700
Subject: [PATCH 21/23] Revert to hdf5 1.14.3

---
 .github/workflows/run_tests_ubuntu.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/run_tests_ubuntu.yml b/.github/workflows/run_tests_ubuntu.yml
index 00ea58698d..bc03db25bf 100644
--- a/.github/workflows/run_tests_ubuntu.yml
+++ b/.github/workflows/run_tests_ubuntu.yml
@@ -21,7 +21,7 @@ jobs:
 
     strategy:
       matrix:
-        hdf5: [ 1.10.8, 1.12.2, 1.14.5 ]
+        hdf5: [ 1.10.8, 1.12.2, 1.14.3 ]
 
     steps:
       - uses: actions/checkout@v4
@@ -73,7 +73,7 @@ jobs:
 
     strategy:
       matrix:
-        hdf5: [ 1.14.5 ]
+        hdf5: [ 1.14.3 ]
 
     steps:
 
@@ -106,7 +106,7 @@ jobs:
           make -j
           make install -j
           popd
-                    if [ "${{ matrix.hdf5 }}" = "1.14.5" ]; then
+          if [ "${{ matrix.hdf5 }}" = "1.14.5" ]; then
             wget https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5_1.14.5.tar.gz
             tar -zxf hdf5_1.14.5.tar.gz
             mv hdf5_1.14.5 hdf5-1.14.5
@@ -141,7 +141,7 @@ jobs:
 
     strategy:
       matrix:
-        hdf5: [ 1.14.5 ]
+        hdf5: [ 1.14.3 ]
     steps:
 
       - uses: actions/checkout@v4
@@ -236,7 +236,7 @@ jobs:
 
     strategy:
       matrix:
-        hdf5: [ 1.14.5 ]
+        hdf5: [ 1.14.3 ]
     steps:
 
       - uses: actions/checkout@v4
@@ -332,7 +332,7 @@ jobs:
 
     strategy:
       matrix:
-        hdf5: [ 1.14.5 ]
+        hdf5: [ 1.14.3 ]
     steps:
 
       - uses: actions/checkout@v4
@@ -412,7 +412,7 @@ jobs:
 
     strategy:
       matrix:
-        hdf5: [ 1.14.5 ]
+        hdf5: [ 1.14.3 ]
 
     steps:
 
@@ -492,7 +492,7 @@ jobs:
 
     strategy:
       matrix:
-        hdf5: [ 1.14.5 ]
+        hdf5: [ 1.14.3 ]
 
     steps:
 
@@ -574,7 +574,7 @@ jobs:
 
     strategy:
       matrix:
-        hdf5: [ 1.14.5 ]
+        hdf5: [ 1.14.3 ]
 
     steps:
 
@@ -651,7 +651,7 @@ jobs:
 
     strategy:
       matrix:
-        hdf5: [1.10.8, 1.12.2, 1.14.5 ]
+        hdf5: [1.10.8, 1.12.2, 1.14.3 ]
         use_nc4: [ nc3, nc4 ]
         use_dap: [ dap_off, dap_on ]
         use_nczarr: [ nczarr_off, nczarr_on ]
@@ -815,7 +815,7 @@ jobs:
 
     strategy:
       matrix:
-        hdf5: [ 1.10.8, 1.12.2, 1.14.5 ]
+        hdf5: [ 1.10.8, 1.12.2, 1.14.3 ]
         use_nc4: [ nc3, nc4 ]
         use_dap: [ dap_off, dap_on ]
         use_nczarr: [ nczarr_off, nczarr_on ]

From a7552cd543749091be447500e8b524665bc91540 Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Wed, 18 Dec 2024 16:39:06 -0700
Subject: [PATCH 22/23] Add more diagnostic info

---
 .github/workflows/run_tests_ubuntu.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.github/workflows/run_tests_ubuntu.yml b/.github/workflows/run_tests_ubuntu.yml
index bc03db25bf..6ef5d9fc4d 100644
--- a/.github/workflows/run_tests_ubuntu.yml
+++ b/.github/workflows/run_tests_ubuntu.yml
@@ -67,6 +67,10 @@ jobs:
           make install -j
           popd
 
+      - name: Check libhdf5-serial-${{ matrix.hdf5}}
+        run: |
+          ls ${HOME}/environments/**
+
   build-deps-parallel:
 
     runs-on: ubuntu-latest
@@ -127,6 +131,12 @@ jobs:
           make -j
           make install -j
           popd
+
+      - name: Check libhdf5-parallel-${{ matrix.hdf5}}
+        run: |
+          ls ${HOME}/environments/**
+          echo ""
+          mpicc -v
           
   #####
   # One-Off Autotools-based tests.

From 1f1b23b35426aac014459969ae02bd5d37df642b Mon Sep 17 00:00:00 2001
From: Ward Fisher <wfisher@ucar.edu>
Date: Wed, 18 Dec 2024 16:47:31 -0700
Subject: [PATCH 23/23] Additional cache checking.

---
 .github/workflows/run_tests_ubuntu.yml | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/run_tests_ubuntu.yml b/.github/workflows/run_tests_ubuntu.yml
index 6ef5d9fc4d..5750cc6c1f 100644
--- a/.github/workflows/run_tests_ubuntu.yml
+++ b/.github/workflows/run_tests_ubuntu.yml
@@ -95,7 +95,18 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/environments/${{ matrix.hdf5 }}
-          key: hdf5-parallel-${{ runner.os }}-${{ matrix.hdf5 }}
+          key: hdf5-parallel-${{ runner.os }}-${{ matrix.hdf5 }}-mpicc
+
+
+      - name: Install mpicc manually
+        shell: bash -l {0}
+        run: |
+          sudo apt remove mpich -y && sudo apt autoremove -y
+          wget https://www.mpich.org/static/downloads/4.2.3/mpich-4.2.3.tar.gz
+          tar -zxf mpich-4.2.3.tar.gz
+          cd mpich-4.2.3
+          ./configure --prefix=/usr
+          make -j 12 && sudo make install -j 12
 
 
       - name: Build libhdf5-${{ matrix.hdf5 }}-pnetcdf-1.12.3
@@ -364,7 +375,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/environments/${{ matrix.hdf5 }}
-          key: hdf5-parallel-${{ runner.os }}-${{ matrix.hdf5 }}
+          key: hdf5-parallel-${{ runner.os }}-${{ matrix.hdf5 }}-mpicc
 
       - name: Check Cache
         shell: bash -l {0}
@@ -610,7 +621,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/environments/${{ matrix.hdf5 }}
-          key: hdf5-parallel-${{ runner.os }}-${{ matrix.hdf5 }}
+          key: hdf5-parallel-${{ runner.os }}-${{ matrix.hdf5 }}-mpicc
 
       - name: Check Cache
         shell: bash -l {0}