From bdc9d0e6c31f3cdf75c1a0867d087d2647c4918e Mon Sep 17 00:00:00 2001 From: Larry Knox Date: Thu, 14 Nov 2024 16:32:22 -0600 Subject: [PATCH 1/3] Update version in configure.ac to 4.3.1-1. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index c842d27c7..f4720a6ca 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ ## NOTE: Do not forget to change the version number here when we do a ## release!!! ## -AC_INIT([HDF], [4.2.17-1], [help@hdfgroup.org]) +AC_INIT([HDF], [4.3.1-1], [help@hdfgroup.org]) AC_CONFIG_SRCDIR([hdf/src/atom.c]) AC_CONFIG_HEADERS([hdf/src/h4config.h]) From 388fa0aff3e987cef7c39707173312e67a462671 Mon Sep 17 00:00:00 2001 From: Larry Knox Date: Fri, 15 Nov 2024 07:50:28 -0600 Subject: [PATCH 2/3] Disable hdf5 in this workflow. --- .github/workflows/netcdf.yml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/.github/workflows/netcdf.yml b/.github/workflows/netcdf.yml index 6b752bcf7..ca86e0a66 100644 --- a/.github/workflows/netcdf.yml +++ b/.github/workflows/netcdf.yml @@ -40,19 +40,6 @@ jobs: make -j sudo make install -j - - name: Checkout HDF5 - uses: actions/checkout@v4.1.7 - with: - repository: HDFGroup/hdf5 - path: hdf5 - - name: Install HDF5 - run: | - cd hdf5 - ./autogen.sh - ./configure --prefix=/usr/local --disable-tests --disable-static --enable-shared --enable-hl --with-szlib - make -j - sudo make install -j - - name: Checkout netCDF uses: actions/checkout@v4.1.7 with: @@ -63,7 +50,7 @@ jobs: run: | cd netcdf-c autoreconf -if - CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ./configure --enable-hdf5 --enable-hdf4 --enable-hdf4-file-tests --enable-dap --disable-dap-remote-tests --enable-external-server-tests + CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ./configure --disable-hdf5 --enable-hdf4 --enable-hdf4-file-tests --enable-dap --disable-dap-remote-tests --enable-external-server-tests cat config.log cat libnetcdf.settings CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} make -j From a0ce5876695b1fae368a74fc2da94098b9ce39c1 Mon Sep 17 00:00:00 2001 From: Larry Knox Date: Fri, 15 Nov 2024 08:08:52 -0600 Subject: [PATCH 3/3] Enable hdf5, but 1.14.5 release instead of develop. --- .github/workflows/netcdf.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/netcdf.yml b/.github/workflows/netcdf.yml index ca86e0a66..0733ffef6 100644 --- a/.github/workflows/netcdf.yml +++ b/.github/workflows/netcdf.yml @@ -40,6 +40,21 @@ jobs: make -j sudo make install -j + - name: Checkout HDF5 + uses: actions/checkout@v4.1.7 + with: + repository: HDFGroup/hdf5 + path: hdf5 + ref: hdf5_1.14.5 + + - name: Install HDF5 + run: | + cd hdf5 + ./autogen.sh + ./configure --prefix=/usr/local --disable-tests --disable-static --enable-shared --enable-hl --with-szlib + make -j + sudo make install -j + - name: Checkout netCDF uses: actions/checkout@v4.1.7 with: @@ -50,7 +65,7 @@ jobs: run: | cd netcdf-c autoreconf -if - CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ./configure --disable-hdf5 --enable-hdf4 --enable-hdf4-file-tests --enable-dap --disable-dap-remote-tests --enable-external-server-tests + CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} ./configure --enable-hdf5 --enable-hdf4 --enable-hdf4-file-tests --enable-dap --disable-dap-remote-tests --enable-external-server-tests cat config.log cat libnetcdf.settings CFLAGS=${CFLAGS} LDFLAGS=${LDFLAGS} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} make -j