From 7c5d856474b6b10dea263dbedf0bdcb18dfaa931 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Mon, 10 Jan 2022 21:25:27 +0000 Subject: [PATCH 1/5] Update intel.yml for latest nceplibs tag. Fixes #615. --- .github/workflows/intel.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml index cb0231749..30a2c8084 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -137,15 +137,15 @@ jobs: uses: actions/cache@v2 with: path: ~/nceplibs - key: nceplibs-1.3.0-${{ runner.os }}-intel3 + key: nceplibs-1.4.0-${{ runner.os }}-intel3 - name: build-nceplibs if: steps.cache-nceplibs.outputs.cache-hit != 'true' run: | export ESMFMKFILE=~/esmf/lib/esmf.mk - wget https://github.com/NOAA-EMC/NCEPLIBS/archive/v1.3.0.tar.gz &> /dev/null - tar zxf v1.3.0.tar.gz - cd NCEPLIBS-1.3.0 + wget https://github.com/NOAA-EMC/NCEPLIBS/archive/v1.4.0.tar.gz &> /dev/null + tar zxf v1.4.0.tar.gz + cd NCEPLIBS-1.4.0 mkdir build && cd build cmake .. -DCMAKE_PREFIX_PATH='~;~/jasper;~/netcdf' -DCMAKE_INSTALL_PREFIX='~/nceplibs' -DFLAT=ON make -j2 From edec1d2518c12ac8d113e9a8815753edc3aabbf3 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Mon, 10 Jan 2022 21:44:23 +0000 Subject: [PATCH 2/5] Update intel.yml to use later version of esmf (8.1.1). Fixes #615. --- .github/workflows/intel.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/intel.yml b/.github/workflows/intel.yml index 30a2c8084..c4fc4aca0 100644 --- a/.github/workflows/intel.yml +++ b/.github/workflows/intel.yml @@ -85,16 +85,16 @@ jobs: uses: actions/cache@v2 with: path: ~/esmf - key: esmf-8.0.1-${{ runner.os }}-intel3 + key: esmf-8.1.1-${{ runner.os }}-intel3 - name: build-esmf if: steps.cache-esmf.outputs.cache-hit != 'true' run: | pushd ~ - export ESMF_DIR=~/esmf-ESMF_8_0_1 - wget https://github.com/esmf-org/esmf/archive/ESMF_8_0_1.tar.gz &> /dev/null - tar zxf ESMF_8_0_1.tar.gz - cd esmf-ESMF_8_0_1 + export ESMF_DIR=~/esmf-ESMF_8_1_1 + wget https://github.com/esmf-org/esmf/archive/ESMF_8_1_1.tar.gz &> /dev/null + tar zxf ESMF_8_1_1.tar.gz + cd esmf-ESMF_8_1_1 export ESMF_COMM=intelmpi export ESMF_INSTALL_BINDIR=bin export ESMF_INSTALL_LIBDIR=lib From 402cd0fe98b07eec2990030f5c01b96e7eb2aceb Mon Sep 17 00:00:00 2001 From: George Gayno Date: Mon, 10 Jan 2022 21:56:30 +0000 Subject: [PATCH 3/5] Update the remaining workflows. Fixes #615. --- .github/workflows/debug-docs-test_coverage.yml | 18 +++++++++--------- .github/workflows/linux-mac-nceplibs-mpi.yml | 16 ++++++++-------- .github/workflows/netcdf-versions.yml | 18 +++++++++--------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/debug-docs-test_coverage.yml b/.github/workflows/debug-docs-test_coverage.yml index 0f920f471..8aef6c911 100644 --- a/.github/workflows/debug-docs-test_coverage.yml +++ b/.github/workflows/debug-docs-test_coverage.yml @@ -26,16 +26,16 @@ jobs: uses: actions/cache@v2 with: path: ~/esmf - key: esmf-8.0.1-${{ runner.os }}3 + key: esmf-8.1.1-${{ runner.os }}3 - name: build-esmf if: steps.cache-esmf.outputs.cache-hit != 'true' run: | pushd ~ - export ESMF_DIR=~/esmf-ESMF_8_0_1 - wget https://github.com/esmf-org/esmf/archive/ESMF_8_0_1.tar.gz &> /dev/null - tar zxf ESMF_8_0_1.tar.gz - cd esmf-ESMF_8_0_1 + export ESMF_DIR=~/esmf-ESMF_8_1_1 + wget https://github.com/esmf-org/esmf/archive/ESMF_8_1_1.tar.gz &> /dev/null + tar zxf ESMF_8_1_1.tar.gz + cd esmf-ESMF_8_1_1 export ESMF_COMM=mpich3 export ESMF_INSTALL_BINDIR=bin export ESMF_INSTALL_LIBDIR=lib @@ -71,14 +71,14 @@ jobs: uses: actions/cache@v2 with: path: ~/nceplibs - key: nceplibs-1.3.0-${{ runner.os }}3 + key: nceplibs-1.4.0-${{ runner.os }}3 - name: build-nceplibs if: steps.cache-nceplibs.outputs.cache-hit != 'true' run: | - wget https://github.com/NOAA-EMC/NCEPLIBS/archive/v1.3.0.tar.gz &> /dev/null - tar zxf v1.3.0.tar.gz - cd NCEPLIBS-1.3.0 + wget https://github.com/NOAA-EMC/NCEPLIBS/archive/v1.4.0.tar.gz &> /dev/null + tar zxf v1.4.0.tar.gz + cd NCEPLIBS-1.4.0 export ESMFMKFILE=~/esmf/lib/esmf.mk mkdir build && cd build cmake .. -DCMAKE_PREFIX_PATH='~;~/jasper' -DCMAKE_INSTALL_PREFIX='~/nceplibs' -DFLAT=ON diff --git a/.github/workflows/linux-mac-nceplibs-mpi.yml b/.github/workflows/linux-mac-nceplibs-mpi.yml index 4776bec3b..1cf8df4f1 100644 --- a/.github/workflows/linux-mac-nceplibs-mpi.yml +++ b/.github/workflows/linux-mac-nceplibs-mpi.yml @@ -16,7 +16,7 @@ jobs: matrix: os: [macos-10.15, ubuntu-20.04] compiler: [gcc-9] - nceplibs_version: [develop, 1.3.0] + nceplibs_version: [develop, 1.4.0] mpi_type: [mpich, openmpi] netcdf_version: [4.7.4] @@ -123,17 +123,17 @@ jobs: uses: actions/cache@v2 with: path: ~/esmf - key: esmf--8.0.1-${{ runner.os }}-${{ matrix.mpi_type }}-netcdf-${{ matrix.netcdf_version }}3 + key: esmf--8.1.1-${{ runner.os }}-${{ matrix.mpi_type }}-netcdf-${{ matrix.netcdf_version }}3 - name: build-esmf if: steps.cache-esmf.outputs.cache-hit != 'true' run: | set -x pushd ~ - export ESMF_DIR=~/esmf-ESMF_8_0_1 - wget https://github.com/esmf-org/esmf/archive/ESMF_8_0_1.tar.gz &> /dev/null - tar zxf ESMF_8_0_1.tar.gz - cd esmf-ESMF_8_0_1 + export ESMF_DIR=~/esmf-ESMF_8_1_1 + wget https://github.com/esmf-org/esmf/archive/ESMF_8_1_1.tar.gz &> /dev/null + tar zxf ESMF_8_1_1.tar.gz + cd esmf-ESMF_8_1_1 if [[ ${{ matrix.mpi_type}} == "mpich" ]]; then export ESMF_COMM=mpich3 elif [[ ${{ matrix.mpi_type}} == "openmpi" ]]; then @@ -175,8 +175,8 @@ jobs: run: | git clone https://github.com/NOAA-EMC/NCEPLIBS.git nceplibs cd nceplibs - if [[ ${{ matrix.nceplibs_version }} == "1.3.0" ]]; then - git checkout v1.3.0 + if [[ ${{ matrix.nceplibs_version }} == "1.4.0" ]]; then + git checkout v1.4.0 fi - name: get-git-hash diff --git a/.github/workflows/netcdf-versions.yml b/.github/workflows/netcdf-versions.yml index c286011a7..bc8b4e1a9 100644 --- a/.github/workflows/netcdf-versions.yml +++ b/.github/workflows/netcdf-versions.yml @@ -76,16 +76,16 @@ jobs: uses: actions/cache@v2 with: path: ~/esmf - key: esmf-8.0.1-${{ runner.os }}-netcdf-${{ matrix.netcdf_version }}3 + key: esmf-8.1.1-${{ runner.os }}-netcdf-${{ matrix.netcdf_version }}3 - name: build-esmf #if: steps.cache-esmf.outputs.cache-hit != 'true' run: | pushd ~ - export ESMF_DIR=~/esmf-ESMF_8_0_1 - wget https://github.com/esmf-org/esmf/archive/ESMF_8_0_1.tar.gz &> /dev/null - tar zxf ESMF_8_0_1.tar.gz - cd esmf-ESMF_8_0_1 + export ESMF_DIR=~/esmf-ESMF_8_1_1 + wget https://github.com/esmf-org/esmf/archive/ESMF_8_1_1.tar.gz &> /dev/null + tar zxf ESMF_8_1_1.tar.gz + cd esmf-ESMF_8_1_1 export ESMF_COMM=mpich3 export ESMF_INSTALL_BINDIR=bin export ESMF_INSTALL_LIBDIR=lib @@ -122,14 +122,14 @@ jobs: uses: actions/cache@v2 with: path: ~/nceplibs - key: nceplibs-1.3.0-${{ runner.os }}-netcdf-${{ matrix.netcdf_version }}3 + key: nceplibs-1.4.0-${{ runner.os }}-netcdf-${{ matrix.netcdf_version }}3 - name: build-nceplibs if: steps.cache-nceplibs.outputs.cache-hit != 'true' run: | - wget https://github.com/NOAA-EMC/NCEPLIBS/archive/v1.3.0.tar.gz &> /dev/null - tar zxf v1.3.0.tar.gz - cd NCEPLIBS-1.3.0 + wget https://github.com/NOAA-EMC/NCEPLIBS/archive/v1.4.0.tar.gz &> /dev/null + tar zxf v1.4.0.tar.gz + cd NCEPLIBS-1.4.0 export ESMFMKFILE=~/esmf/lib/esmf.mk mkdir build && cd build cmake .. -DCMAKE_PREFIX_PATH='~;~/jasper;~/netcdf' -DCMAKE_INSTALL_PREFIX='~/nceplibs' -DFLAT=ON From 1b4d0eae5b6cdbb7c3974759a8ac09fd3a9b7273 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Fri, 14 Jan 2022 16:49:11 +0000 Subject: [PATCH 4/5] Debug the linux workflow. Fixes #615 --- .github/workflows/linux-mac-nceplibs-mpi.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux-mac-nceplibs-mpi.yml b/.github/workflows/linux-mac-nceplibs-mpi.yml index 1cf8df4f1..9e62a5b31 100644 --- a/.github/workflows/linux-mac-nceplibs-mpi.yml +++ b/.github/workflows/linux-mac-nceplibs-mpi.yml @@ -16,7 +16,7 @@ jobs: matrix: os: [macos-10.15, ubuntu-20.04] compiler: [gcc-9] - nceplibs_version: [develop, 1.4.0] + nceplibs_version: [develop, 1.3.0] mpi_type: [mpich, openmpi] netcdf_version: [4.7.4] @@ -175,7 +175,7 @@ jobs: run: | git clone https://github.com/NOAA-EMC/NCEPLIBS.git nceplibs cd nceplibs - if [[ ${{ matrix.nceplibs_version }} == "1.4.0" ]]; then + if [[ ${{ matrix.nceplibs_version }} == "1.3.0" ]]; then git checkout v1.4.0 fi From 7124147c051d55d0e08cb565dc66cf421adeac6b Mon Sep 17 00:00:00 2001 From: George Gayno Date: Fri, 14 Jan 2022 18:11:38 +0000 Subject: [PATCH 5/5] Update nceplibs gitflow id. Fixes #615 --- .github/workflows/linux-mac-nceplibs-mpi.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux-mac-nceplibs-mpi.yml b/.github/workflows/linux-mac-nceplibs-mpi.yml index 9e62a5b31..1cf8df4f1 100644 --- a/.github/workflows/linux-mac-nceplibs-mpi.yml +++ b/.github/workflows/linux-mac-nceplibs-mpi.yml @@ -16,7 +16,7 @@ jobs: matrix: os: [macos-10.15, ubuntu-20.04] compiler: [gcc-9] - nceplibs_version: [develop, 1.3.0] + nceplibs_version: [develop, 1.4.0] mpi_type: [mpich, openmpi] netcdf_version: [4.7.4] @@ -175,7 +175,7 @@ jobs: run: | git clone https://github.com/NOAA-EMC/NCEPLIBS.git nceplibs cd nceplibs - if [[ ${{ matrix.nceplibs_version }} == "1.3.0" ]]; then + if [[ ${{ matrix.nceplibs_version }} == "1.4.0" ]]; then git checkout v1.4.0 fi