From c633fc72382beafc59c0c00c3d6c19e7c50b7144 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 7 Nov 2023 11:05:40 -0700 Subject: [PATCH] CI: Use new version of hdf5 and cgns --- .github/workflows/build_test.yml | 8 ++++---- .github/workflows/build_variant.yml | 8 ++++---- .github/workflows/coverity-scan.yml | 8 ++++---- .github/workflows/intel-build.yml | 8 ++++---- install-tpl.sh | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index bbdb278731..d551e210a3 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -23,7 +23,7 @@ jobs: compiler: [ gnu, clang, mpi ] hdf5: [ V18, V110, V114 ] netcdf: [ 4.9.2 ] - cgns: [ 4.3.0 ] + cgns: [ 4.4.0 ] steps: - uses: actions/checkout@v3 @@ -40,7 +40,7 @@ jobs: uses: actions/cache@v3 with: path: ~/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - key: TPL-v4-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} + key: TPL-v1-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - name: Build TPL-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} if: steps.cache-TPL.outputs.cache-hit != 'true' @@ -64,7 +64,7 @@ jobs: compiler: [ gnu, clang, mpi ] hdf5: [ V18, V110, V114 ] netcdf: [ 4.9.2 ] - cgns: [ 4.3.0 ] + cgns: [ 4.4.0 ] steps: - uses: actions/checkout@v3 @@ -78,7 +78,7 @@ jobs: uses: actions/cache@v3 with: path: ~/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - key: TPL-v4-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} + key: TPL-v1-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - name: Check Cache shell: bash -l {0} diff --git a/.github/workflows/build_variant.yml b/.github/workflows/build_variant.yml index 853b327978..7e663b1df6 100644 --- a/.github/workflows/build_variant.yml +++ b/.github/workflows/build_variant.yml @@ -24,7 +24,7 @@ jobs: compiler: [ gnu, clang, mpi ] hdf5: [ V110 ] netcdf: [ 4.9.2 ] - cgns: [ 4.3.0 ] + cgns: [ 4.4.0 ] steps: - uses: actions/checkout@v3 @@ -41,7 +41,7 @@ jobs: uses: actions/cache@v3 with: path: ~/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - key: TPL-v4-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} + key: TPL-v1-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - name: Build TPL-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} if: steps.cache-TPL.outputs.cache-hit != 'true' @@ -62,7 +62,7 @@ jobs: matrix: hdf5: [ V110 ] netcdf: [ 4.9.2 ] - cgns: [ 4.3.0 ] + cgns: [ 4.4.0 ] config: - { name: "Debug serial build", @@ -317,7 +317,7 @@ jobs: uses: actions/cache@v3 with: path: ~/environments/${{ matrix.config.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - key: TPL-v4-${{ runner.os }}-${{ matrix.config.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} + key: TPL-v1-${{ runner.os }}-${{ matrix.config.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - name: Check Cache shell: bash -l {0} diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan.yml index e3b633a02f..22e2fc02ed 100644 --- a/.github/workflows/coverity-scan.yml +++ b/.github/workflows/coverity-scan.yml @@ -14,7 +14,7 @@ jobs: compiler: [ gnu ] hdf5: [ V110 ] netcdf: [ 4.9.2 ] - cgns: [ 4.3.0 ] + cgns: [ 4.4.0 ] steps: - uses: actions/checkout@v3 @@ -31,7 +31,7 @@ jobs: uses: actions/cache@v3 with: path: ~/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - key: TPL-v2-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} + key: TPL-v1-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - name: Build TPL-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} if: steps.cache-TPL.outputs.cache-hit != 'true' @@ -55,7 +55,7 @@ jobs: compiler: [ gnu ] hdf5: [ V110 ] netcdf: [ 4.9.2 ] - cgns: [ 4.3.0 ] + cgns: [ 4.4.0 ] steps: - uses: actions/checkout@v3 @@ -69,7 +69,7 @@ jobs: uses: actions/cache@v3 with: path: ~/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - key: TPL-v2-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} + key: TPL-v1-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - name: Check Cache shell: bash -l {0} diff --git a/.github/workflows/intel-build.yml b/.github/workflows/intel-build.yml index f4e6378c55..b91f27756a 100644 --- a/.github/workflows/intel-build.yml +++ b/.github/workflows/intel-build.yml @@ -23,7 +23,7 @@ jobs: compiler: [ intel, mpi ] hdf5: [ V114 ] netcdf: [ 4.9.2 ] - cgns: [ 4.3.0 ] + cgns: [ 4.4.0 ] defaults: run: @@ -67,7 +67,7 @@ jobs: uses: actions/cache@v3 with: path: ~/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - key: TPL-v5intel-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} + key: TPL-v1intel-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - name: Build TPL-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} if: steps.cache-TPL.outputs.cache-hit != 'true' @@ -89,7 +89,7 @@ jobs: compiler: [ intel, mpi ] hdf5: [ V114 ] netcdf: [ 4.9.2 ] - cgns: [ 4.3.0 ] + cgns: [ 4.4.0 ] steps: - name: Maximize build space @@ -126,7 +126,7 @@ jobs: uses: actions/cache@v3 with: path: ~/environments/${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - key: TPL-v5intel-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} + key: TPL-v1intel-${{ runner.os }}-${{ matrix.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} - name: Check Cache shell: bash -l {0} diff --git a/install-tpl.sh b/install-tpl.sh index d7fe2335f7..363131298e 100755 --- a/install-tpl.sh +++ b/install-tpl.sh @@ -427,7 +427,7 @@ then hdf_version="1.13.1" hdf_base="1.13" elif [ "${H5VERSION}" == "V114" ]; then - hdf_version="1.14.2" + hdf_version="1.14.3" hdf_base="1.14" hdf_suffix="" elif [ "${H5VERSION}" == "develop" ]; then