From 70850402d3fedbc167b3d629e695c7e15fcd583f Mon Sep 17 00:00:00 2001
From: "George.Gayno" <george.gayno@noaa.gov>
Date: Tue, 8 Nov 2022 13:24:14 +0000
Subject: [PATCH 1/7] Turn off gcovr from mac workflow.

---
 .github/workflows/linux-mac-nceplibs-mpi.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/linux-mac-nceplibs-mpi.yml b/.github/workflows/linux-mac-nceplibs-mpi.yml
index aa8a65d93..92631e666 100644
--- a/.github/workflows/linux-mac-nceplibs-mpi.yml
+++ b/.github/workflows/linux-mac-nceplibs-mpi.yml
@@ -39,7 +39,6 @@ jobs:
             sudo ln -sf /usr/local/bin/gfortran-10 /usr/local/bin/gfortran
           fi
         fi
-        python3 -m pip install gcovr
 
     - name: cache-mpi
       id: cache-mpi

From e8ca8755700a90be8aee9b29aa544182e1763081 Mon Sep 17 00:00:00 2001
From: "George.Gayno" <george.gayno@noaa.gov>
Date: Tue, 8 Nov 2022 13:44:49 +0000
Subject: [PATCH 2/7] Revert to macos-11.

---
 .github/workflows/linux-mac-nceplibs-mpi.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/linux-mac-nceplibs-mpi.yml b/.github/workflows/linux-mac-nceplibs-mpi.yml
index 92631e666..83080a93a 100644
--- a/.github/workflows/linux-mac-nceplibs-mpi.yml
+++ b/.github/workflows/linux-mac-nceplibs-mpi.yml
@@ -14,7 +14,7 @@ jobs:
       CXX: g++-9
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-latest]
+        os: [macos-11, ubuntu-latest]
         compiler: [gcc-9]
         nceplibs_version: [develop, 1.4.0]
         mpi_type: [mpich, openmpi]
@@ -29,7 +29,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install libpng-dev
           sudo apt-get install libjpeg-dev
-        elif [[ ${{ matrix.os }} == "macos-latest" ]]; then
+        elif [[ ${{ matrix.os }} == "macos-11" ]]; then
           brew update
           brew install wget
           brew install jpeg-turbo
@@ -39,6 +39,7 @@ jobs:
             sudo ln -sf /usr/local/bin/gfortran-10 /usr/local/bin/gfortran
           fi
         fi
+        python3 -m pip install gcovr
 
     - name: cache-mpi
       id: cache-mpi
@@ -63,7 +64,7 @@ jobs:
           cd openmpi-4.1.1
           if [[ ${{ matrix.os }} == "ubuntu-latest" ]]; then
             ./configure --prefix=$HOME/mpi --enable-mpi-fortran --enable-mpi-cxx
-          elif [[ ${{ matrix.os }} == "macos-latest" ]]; then
+          elif [[ ${{ matrix.os }} == "macos-11" ]]; then
             ./configure --prefix=$HOME/mpi --enable-mpi-fortran --enable-mpi-cxx --enable-two-level-namespace
           fi
           make -j2

From 61384a5beec249fa69b21aafe94414fded1fee44 Mon Sep 17 00:00:00 2001
From: "George.Gayno" <george.gayno@noaa.gov>
Date: Tue, 8 Nov 2022 13:50:30 +0000
Subject: [PATCH 3/7] Remove gcovr again.

---
 .github/workflows/linux-mac-nceplibs-mpi.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/linux-mac-nceplibs-mpi.yml b/.github/workflows/linux-mac-nceplibs-mpi.yml
index 83080a93a..82d35a9d2 100644
--- a/.github/workflows/linux-mac-nceplibs-mpi.yml
+++ b/.github/workflows/linux-mac-nceplibs-mpi.yml
@@ -39,7 +39,6 @@ jobs:
             sudo ln -sf /usr/local/bin/gfortran-10 /usr/local/bin/gfortran
           fi
         fi
-        python3 -m pip install gcovr
 
     - name: cache-mpi
       id: cache-mpi

From dd4c2f13cd07763b428360961c54d4a40290b57d Mon Sep 17 00:00:00 2001
From: "George.Gayno" <george.gayno@noaa.gov>
Date: Tue, 15 Nov 2022 14:20:00 +0000
Subject: [PATCH 4/7] Force rebuild of mpi.

Part of #712.
---
 .github/workflows/linux-mac-nceplibs-mpi.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/linux-mac-nceplibs-mpi.yml b/.github/workflows/linux-mac-nceplibs-mpi.yml
index 82d35a9d2..6aa7a2c28 100644
--- a/.github/workflows/linux-mac-nceplibs-mpi.yml
+++ b/.github/workflows/linux-mac-nceplibs-mpi.yml
@@ -45,7 +45,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ~/mpi
-        key: mpi-${{ matrix.mpi_type }}-${{ runner.os }}
+        key: mpi-${{ matrix.mpi_type }}-${{ runner.os }}-1
 
     - name: build-mpi
       if: steps.cache-mpi.outputs.cache-hit != 'true'

From 7041c13f8e6b9e7976a600dfc941f477c15fbffd Mon Sep 17 00:00:00 2001
From: "George.Gayno" <george.gayno@noaa.gov>
Date: Tue, 15 Nov 2022 15:03:45 +0000
Subject: [PATCH 5/7] Force rebuid of netcdf.

Part of #712.
---
 .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 6aa7a2c28..10d88ab91 100644
--- a/.github/workflows/linux-mac-nceplibs-mpi.yml
+++ b/.github/workflows/linux-mac-nceplibs-mpi.yml
@@ -45,7 +45,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ~/mpi
-        key: mpi-${{ matrix.mpi_type }}-${{ runner.os }}-1
+        key: mpi-${{ matrix.mpi_type }}-${{ runner.os }}
 
     - name: build-mpi
       if: steps.cache-mpi.outputs.cache-hit != 'true'
@@ -75,7 +75,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ~/netcdf
-        key: netcdf-c-${{ matrix.netcdf_version }}-${{ runner.os }}-${{ matrix.mpi_type }}3
+        key: netcdf-c-${{ matrix.netcdf_version }}-${{ runner.os }}-${{ matrix.mpi_type }}-1
 
     - name: build-hdf5
       if: steps.cache-netcdf.outputs.cache-hit != 'true'

From 9b26862342d38a1cdcfbaf5fd967102a1211a47e Mon Sep 17 00:00:00 2001
From: "George.Gayno" <george.gayno@noaa.gov>
Date: Tue, 15 Nov 2022 15:39:30 +0000
Subject: [PATCH 6/7] Force rebuild of esmf, jasper and nceplibs.

Fixes #712.
---
 .github/workflows/linux-mac-nceplibs-mpi.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/linux-mac-nceplibs-mpi.yml b/.github/workflows/linux-mac-nceplibs-mpi.yml
index 10d88ab91..a70bc8416 100644
--- a/.github/workflows/linux-mac-nceplibs-mpi.yml
+++ b/.github/workflows/linux-mac-nceplibs-mpi.yml
@@ -75,7 +75,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ~/netcdf
-        key: netcdf-c-${{ matrix.netcdf_version }}-${{ runner.os }}-${{ matrix.mpi_type }}-1
+        key: netcdf-c-${{ matrix.netcdf_version }}-${{ runner.os }}-${{ matrix.mpi_type }}3
 
     - name: build-hdf5
       if: steps.cache-netcdf.outputs.cache-hit != 'true'
@@ -123,7 +123,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ~/esmf
-        key: esmf--8.2.0-${{ runner.os }}-${{ matrix.mpi_type }}-netcdf-${{ matrix.netcdf_version }}3
+        key: esmf--8.2.0-${{ runner.os }}-${{ matrix.mpi_type }}-netcdf-${{ matrix.netcdf_version }}-1
 
     - name: build-esmf
       if: steps.cache-esmf.outputs.cache-hit != 'true'
@@ -156,7 +156,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ~/jasper
-        key: jasper-2.0.25-${{ runner.os }}3
+        key: jasper-2.0.25-${{ runner.os }}-1
 
     - name: build-jasper
       if: steps.cache-jasper.outputs.cache-hit != 'true'
@@ -189,7 +189,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ~/nceplibs
-        key: nceplibs-${{ matrix.nceplibs_version }}-${{ runner.os }}-${{ matrix.mpi_type }}-${{ hashFiles('nceplibs/hash.txt') }}3
+        key: nceplibs-${{ matrix.nceplibs_version }}-${{ runner.os }}-${{ matrix.mpi_type }}-${{ hashFiles('nceplibs/hash.txt') }}-1
 
     - name: build-nceplibs
       if: steps.cache-nceplibs.outputs.cache-hit != 'true'

From 424abc56a782aa3f10600eef8f91d1da97d09b69 Mon Sep 17 00:00:00 2001
From: "George.Gayno" <george.gayno@noaa.gov>
Date: Tue, 15 Nov 2022 17:03:28 +0000
Subject: [PATCH 7/7] Reset cache keys to their original settings.

Fixes #712.
---
 .github/workflows/linux-mac-nceplibs-mpi.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/linux-mac-nceplibs-mpi.yml b/.github/workflows/linux-mac-nceplibs-mpi.yml
index a70bc8416..82d35a9d2 100644
--- a/.github/workflows/linux-mac-nceplibs-mpi.yml
+++ b/.github/workflows/linux-mac-nceplibs-mpi.yml
@@ -123,7 +123,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ~/esmf
-        key: esmf--8.2.0-${{ runner.os }}-${{ matrix.mpi_type }}-netcdf-${{ matrix.netcdf_version }}-1
+        key: esmf--8.2.0-${{ runner.os }}-${{ matrix.mpi_type }}-netcdf-${{ matrix.netcdf_version }}3
 
     - name: build-esmf
       if: steps.cache-esmf.outputs.cache-hit != 'true'
@@ -156,7 +156,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ~/jasper
-        key: jasper-2.0.25-${{ runner.os }}-1
+        key: jasper-2.0.25-${{ runner.os }}3
 
     - name: build-jasper
       if: steps.cache-jasper.outputs.cache-hit != 'true'
@@ -189,7 +189,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: ~/nceplibs
-        key: nceplibs-${{ matrix.nceplibs_version }}-${{ runner.os }}-${{ matrix.mpi_type }}-${{ hashFiles('nceplibs/hash.txt') }}-1
+        key: nceplibs-${{ matrix.nceplibs_version }}-${{ runner.os }}-${{ matrix.mpi_type }}-${{ hashFiles('nceplibs/hash.txt') }}3
 
     - name: build-nceplibs
       if: steps.cache-nceplibs.outputs.cache-hit != 'true'