Merge tag 'dev/ncar_231107' into mnlevy1981/add_MARBL

.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

@@ -11,7 +11,7 @@ jobs:
         working-directory: .testing
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: recursive
 
@@ -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
@@ -29,7 +28,3 @@ jobs:
     - name: Compile MOM6 for the NUOPC driver
       shell: bash
       run: make check_mom6_api_nuopc -j
-
-    - name: Compile MOM6 for the MCT driver
-      shell: bash
-      run: make check_mom6_api_mct -j

.github/workflows/coverage.yml

@@ -11,7 +11,7 @@ jobs:
         working-directory: .testing
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: recursive
 

.github/workflows/documentation-and-style.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: recursive
 

.github/workflows/expression.yml

@@ -11,7 +11,7 @@ jobs:
         working-directory: .testing
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: recursive
 

.github/workflows/macos-regression.yml

@@ -8,15 +8,15 @@ jobs:
     runs-on: macOS-latest
 
     env:
-      CC: gcc-11
-      FC: gfortran-11
+      CC: gcc
+      FC: gfortran
 
     defaults:
       run:
         working-directory: .testing
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: recursive
 

.github/workflows/macos-stencil.yml

@@ -8,15 +8,15 @@ jobs:
     runs-on: macOS-latest
 
     env:
-      CC: gcc-11
-      FC: gfortran-11
+      CC: gcc
+      FC: gfortran
 
     defaults:
       run:
         working-directory: .testing
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: recursive
 

.github/workflows/other.yml

@@ -11,7 +11,7 @@ jobs:
         working-directory: .testing
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: recursive
 

.github/workflows/perfmon.yml

@@ -11,7 +11,7 @@ jobs:
         working-directory: .testing
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: recursive
 

.github/workflows/regression.yml

@@ -11,7 +11,7 @@ jobs:
         working-directory: .testing
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: recursive
 

.github/workflows/stencil.yml

@@ -11,7 +11,7 @@ jobs:
         working-directory: .testing
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: recursive