Merge branch 'dev/ncar' into neutral_diffusion_tapering

.github/actions/macos-setup/action.yml

@@ -10,7 +10,7 @@ runs:
       shell: bash
       run: |
         echo "::group::Install packages"
-        brew update
+        brew reinstall gcc
         brew install automake
         brew install netcdf
         brew install netcdf-fortran

.github/actions/testing-setup/action.yml

@@ -5,10 +5,6 @@ inputs:
     description: 'If true, will build the symmetric MOM6 executable'
     required: false
     default: 'true'
-  install_python:
-    description: 'If true, will install the local python env needed for .testing'
-    required: false
-    default: 'true'
 runs:
   using: 'composite'
   steps:
@@ -54,14 +50,6 @@ runs:
         test ${{ inputs.build_symmetric }} == true && make build/symmetric/MOM6 -j
         echo "::endgroup::"
 
-    - name: Install local python venv for generating input data
-      shell: bash
-      run: |
-        echo "::group::Create local python env for input data generation"
-        cd .testing
-        test ${{ inputs.install_python }} == true && make work/local-env
-        echo "::endgroup::"
-
     - name: Set flags
       shell: bash
       run: |

.github/workflows/coupled-api.yml

@@ -20,7 +20,6 @@ jobs:
     - uses: ./.github/actions/testing-setup
       with:
         build_symmetric: 'false'
-        install_python: 'false'
 
     - name: Compile MOM6 for the GFDL coupled driver
       shell: bash

.github/workflows/macos-regression.yml

@@ -8,8 +8,8 @@ jobs:
     runs-on: macOS-latest
 
     env:
-      CC: gcc-11
-      FC: gfortran-11
+      CC: gcc
+      FC: gfortran
 
     defaults:
       run:

.github/workflows/macos-stencil.yml

@@ -8,8 +8,8 @@ jobs:
     runs-on: macOS-latest
 
     env:
-      CC: gcc-11
-      FC: gfortran-11
+      CC: gcc
+      FC: gfortran
 
     defaults:
       run: