From 493c022fcf67f443466b8086db459bbeac1097be Mon Sep 17 00:00:00 2001
From: Ryan Mulhall <35538242+rem1776@users.noreply.github.com>
Date: Wed, 10 Jan 2024 14:17:46 -0500
Subject: [PATCH 01/15] add simple workflow for mom6 test suite

---
 .github/workflows/github_mom_gnu.yml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 .github/workflows/github_mom_gnu.yml

diff --git a/.github/workflows/github_mom_gnu.yml b/.github/workflows/github_mom_gnu.yml
new file mode 100644
index 0000000000..60698fa5c3
--- /dev/null
+++ b/.github/workflows/github_mom_gnu.yml
@@ -0,0 +1,27 @@
+# 'main' required ci, does a distcheck (builds, tests, check install)
+# image created off dockerfile in repo, compile/link flags are set there
+name: Build libFMS test with autotools
+
+on: [push, pull_request]
+
+# cancel running jobs if theres a newer push
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container:
+      image: noaagfdl/fms-ci-rocky-gnu:12.3.0
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+      with:
+        repository: 'NOAA-GFDL/MOM6'
+    - name: Build FMS and MOM test suite with makedep
+      run: |
+        cd .testing
+        make -j
+    - name: Run the tests
+      run: make -j test

From 6a00455a00f8ac7e7a15a805bde48a5d5e9f9c6f Mon Sep 17 00:00:00 2001
From: Ryan Mulhall <35538242+rem1776@users.noreply.github.com>
Date: Wed, 10 Jan 2024 14:49:24 -0500
Subject: [PATCH 02/15] fix name issue, add recursive checkout and pull from
 latest commit

---
 .github/workflows/github_mom_gnu.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/github_mom_gnu.yml b/.github/workflows/github_mom_gnu.yml
index 60698fa5c3..324f0e00a7 100644
--- a/.github/workflows/github_mom_gnu.yml
+++ b/.github/workflows/github_mom_gnu.yml
@@ -1,8 +1,7 @@
-# 'main' required ci, does a distcheck (builds, tests, check install)
-# image created off dockerfile in repo, compile/link flags are set there
-name: Build libFMS test with autotools
+name: Run MOM6 test suite
 
-on: [push, pull_request]
+# runs on PR's or when manually triggered
+on: [workflow_dispatch, pull_request]
 
 # cancel running jobs if theres a newer push
 concurrency:
@@ -15,13 +14,17 @@ jobs:
     container:
       image: noaagfdl/fms-ci-rocky-gnu:12.3.0
     steps:
+    # clone mom6
     - name: Checkout code
       uses: actions/checkout@v4
       with:
         repository: 'NOAA-GFDL/MOM6'
+        submodules: recursive
     - name: Build FMS and MOM test suite with makedep
       run: |
         cd .testing
         make -j
+      env:
+        FMS_BRANCH: $GITHUB_SHA
     - name: Run the tests
       run: make -j test

From 2053561ea04e7546fc9e699a8e3da57383c882ce Mon Sep 17 00:00:00 2001
From: Ryan Mulhall <35538242+rem1776@users.noreply.github.com>
Date: Wed, 10 Jan 2024 14:59:36 -0500
Subject: [PATCH 03/15] change image registry to github

---
 .github/workflows/github_mom_gnu.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/github_mom_gnu.yml b/.github/workflows/github_mom_gnu.yml
index 324f0e00a7..f33b527f32 100644
--- a/.github/workflows/github_mom_gnu.yml
+++ b/.github/workflows/github_mom_gnu.yml
@@ -12,19 +12,21 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container:
-      image: noaagfdl/fms-ci-rocky-gnu:12.3.0
+      image: ghcr.io/noaa-gfdl/fms/fms-ci-rocky-gnu:12.3.0
+      credentials:
+        username: ${{ github.actor }}
+        password: ${{ secrets.github_token }}
     steps:
-    # clone mom6
-    - name: Checkout code
+    - name: Checkout MOM6 repository
       uses: actions/checkout@v4
       with:
         repository: 'NOAA-GFDL/MOM6'
         submodules: recursive
-    - name: Build FMS and MOM test suite with makedep
+    - name: Build FMS and MOM test suite
       run: |
         cd .testing
         make -j
       env:
         FMS_BRANCH: $GITHUB_SHA
-    - name: Run the tests
+    - name: Run MOM tests
       run: make -j test

From 6e1a1c9c30732a5bf53e41f598ac914d8ef8bb9c Mon Sep 17 00:00:00 2001
From: Ryan Mulhall <35538242+rem1776@users.noreply.github.com>
Date: Wed, 10 Jan 2024 15:02:46 -0500
Subject: [PATCH 04/15] fix variable name for FMS commit

---
 .github/workflows/github_mom_gnu.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/github_mom_gnu.yml b/.github/workflows/github_mom_gnu.yml
index f33b527f32..19da53eebe 100644
--- a/.github/workflows/github_mom_gnu.yml
+++ b/.github/workflows/github_mom_gnu.yml
@@ -27,6 +27,6 @@ jobs:
         cd .testing
         make -j
       env:
-        FMS_BRANCH: $GITHUB_SHA
+        FMS_COMMIT: $GITHUB_SHA
     - name: Run MOM tests
       run: make -j test

From 4f12000442a53ce8bf5b18b6b00a19888219c3cd Mon Sep 17 00:00:00 2001
From: Ryan Mulhall <35538242+rem1776@users.noreply.github.com>
Date: Wed, 10 Jan 2024 15:06:22 -0500
Subject: [PATCH 05/15] fix formatting on SHA variable

---
 .github/workflows/github_mom_gnu.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/github_mom_gnu.yml b/.github/workflows/github_mom_gnu.yml
index 19da53eebe..f91d6d1606 100644
--- a/.github/workflows/github_mom_gnu.yml
+++ b/.github/workflows/github_mom_gnu.yml
@@ -27,6 +27,6 @@ jobs:
         cd .testing
         make -j
       env:
-        FMS_COMMIT: $GITHUB_SHA
+        FMS_COMMIT: ${{ GITHUB_SHA }}
     - name: Run MOM tests
       run: make -j test

From b0db78b16a95211c619d38b06ed264cb51906541 Mon Sep 17 00:00:00 2001
From: Ryan Mulhall <35538242+rem1776@users.noreply.github.com>
Date: Wed, 10 Jan 2024 15:30:27 -0500
Subject: [PATCH 06/15] fix sha variable (again)

---
 .github/workflows/github_mom_gnu.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/github_mom_gnu.yml b/.github/workflows/github_mom_gnu.yml
index f91d6d1606..d858b1245e 100644
--- a/.github/workflows/github_mom_gnu.yml
+++ b/.github/workflows/github_mom_gnu.yml
@@ -27,6 +27,6 @@ jobs:
         cd .testing
         make -j
       env:
-        FMS_COMMIT: ${{ GITHUB_SHA }}
+        FMS_COMMIT: ${{ github.sha }}
     - name: Run MOM tests
       run: make -j test

From c92cba6937a706e989c4c15ca294e9e64a4de21e Mon Sep 17 00:00:00 2001
From: Ryan Mulhall <35538242+rem1776@users.noreply.github.com>
Date: Wed, 10 Jan 2024 15:43:00 -0500
Subject: [PATCH 07/15] change sha to ref

---
 .github/workflows/github_mom_gnu.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/github_mom_gnu.yml b/.github/workflows/github_mom_gnu.yml
index d858b1245e..3b061916f4 100644
--- a/.github/workflows/github_mom_gnu.yml
+++ b/.github/workflows/github_mom_gnu.yml
@@ -27,6 +27,6 @@ jobs:
         cd .testing
         make -j
       env:
-        FMS_COMMIT: ${{ github.sha }}
+        FMS_COMMIT: ${{ github.ref }}
     - name: Run MOM tests
       run: make -j test

From dae1115e5e7e4ecd9acf9d2af3fbf87109c9afaa Mon Sep 17 00:00:00 2001
From: Ryan Mulhall <35538242+rem1776@users.noreply.github.com>
Date: Wed, 10 Jan 2024 17:02:45 -0500
Subject: [PATCH 08/15] set FMS url

---
 .github/workflows/github_mom_gnu.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/github_mom_gnu.yml b/.github/workflows/github_mom_gnu.yml
index 3b061916f4..010275ad95 100644
--- a/.github/workflows/github_mom_gnu.yml
+++ b/.github/workflows/github_mom_gnu.yml
@@ -28,5 +28,6 @@ jobs:
         make -j
       env:
         FMS_COMMIT: ${{ github.ref }}
+        FMS_URL: ${{ github.repositoryUrl }}
     - name: Run MOM tests
       run: make -j test

From 91f63588d3a1546395cbef0ccac277bb0357e575 Mon Sep 17 00:00:00 2001
From: Ryan Mulhall <35538242+rem1776@users.noreply.github.com>
Date: Wed, 10 Jan 2024 17:29:13 -0500
Subject: [PATCH 09/15] switch to env variables, try to get a http url

---
 .github/workflows/github_mom_gnu.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/github_mom_gnu.yml b/.github/workflows/github_mom_gnu.yml
index 010275ad95..32c455f4be 100644
--- a/.github/workflows/github_mom_gnu.yml
+++ b/.github/workflows/github_mom_gnu.yml
@@ -25,9 +25,9 @@ jobs:
     - name: Build FMS and MOM test suite
       run: |
         cd .testing
-        make -j
+        FMS_COMMIT="${GITHUB_SHA}" FMS_URL="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}" make -j
       env:
         FMS_COMMIT: ${{ github.ref }}
-        FMS_URL: ${{ github.repositoryUrl }}
+        FMS_URL: ${}}
     - name: Run MOM tests
       run: make -j test

From 0dc7783351fda5d669cdf143a228944cbb783ffa Mon Sep 17 00:00:00 2001
From: Ryan Mulhall <35538242+rem1776@users.noreply.github.com>
Date: Thu, 11 Jan 2024 09:17:14 -0500
Subject: [PATCH 10/15] try with ref instead of sha

---
 .github/workflows/github_mom_gnu.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/github_mom_gnu.yml b/.github/workflows/github_mom_gnu.yml
index 32c455f4be..be118bf8e7 100644
--- a/.github/workflows/github_mom_gnu.yml
+++ b/.github/workflows/github_mom_gnu.yml
@@ -25,9 +25,6 @@ jobs:
     - name: Build FMS and MOM test suite
       run: |
         cd .testing
-        FMS_COMMIT="${GITHUB_SHA}" FMS_URL="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}" make -j
-      env:
-        FMS_COMMIT: ${{ github.ref }}
-        FMS_URL: ${}}
+        FMS_COMMIT="${GITHUB_REF}" FMS_URL="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}" make -j
     - name: Run MOM tests
       run: make -j test

From 1c61f146972eb7614bc0bb2920d050e7a2348098 Mon Sep 17 00:00:00 2001
From: Ryan Mulhall <35538242+rem1776@users.noreply.github.com>
Date: Wed, 17 Jan 2024 14:08:29 -0500
Subject: [PATCH 11/15] add checkout action with path to mom6 dependency folder

---
 .github/workflows/github_mom_gnu.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/github_mom_gnu.yml b/.github/workflows/github_mom_gnu.yml
index be118bf8e7..85684b479c 100644
--- a/.github/workflows/github_mom_gnu.yml
+++ b/.github/workflows/github_mom_gnu.yml
@@ -22,9 +22,13 @@ jobs:
       with:
         repository: 'NOAA-GFDL/MOM6'
         submodules: recursive
+    - name: Checkout FMS into MOM build
+      uses: actions/checkout@v4
+      with:
+        path: .testing/deps/fms/src
     - name: Build FMS and MOM test suite
       run: |
         cd .testing
-        FMS_COMMIT="${GITHUB_REF}" FMS_URL="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}" make -j
+        make -j
     - name: Run MOM tests
       run: make -j test

From 3ed28f999d29dd0b7f31dfc780a9ca15d1f06584 Mon Sep 17 00:00:00 2001
From: Ryan Mulhall <35538242+rem1776@users.noreply.github.com>
Date: Wed, 17 Jan 2024 14:15:40 -0500
Subject: [PATCH 12/15] add arg to enter correct directory

---
 .github/workflows/github_mom_gnu.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/github_mom_gnu.yml b/.github/workflows/github_mom_gnu.yml
index 85684b479c..5797d29d68 100644
--- a/.github/workflows/github_mom_gnu.yml
+++ b/.github/workflows/github_mom_gnu.yml
@@ -27,8 +27,6 @@ jobs:
       with:
         path: .testing/deps/fms/src
     - name: Build FMS and MOM test suite
-      run: |
-        cd .testing
-        make -j
+      run: make -C .testing -j
     - name: Run MOM tests
-      run: make -j test
+      run: make -C .testing -j test

From 3718d47ab9a0bd9d3df2b726b2d2d66a69d89c00 Mon Sep 17 00:00:00 2001
From: Ryan Mulhall <35538242+rem1776@users.noreply.github.com>
Date: Wed, 17 Jan 2024 14:30:19 -0500
Subject: [PATCH 13/15] add diff install step

---
 .github/workflows/github_mom_gnu.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/github_mom_gnu.yml b/.github/workflows/github_mom_gnu.yml
index 5797d29d68..e6a2998e19 100644
--- a/.github/workflows/github_mom_gnu.yml
+++ b/.github/workflows/github_mom_gnu.yml
@@ -28,5 +28,7 @@ jobs:
         path: .testing/deps/fms/src
     - name: Build FMS and MOM test suite
       run: make -C .testing -j
+    - name: Install diff for testing
+      run: dnf install -y diffutils
     - name: Run MOM tests
       run: make -C .testing -j test

From 0080f193c2db62492ddb568682c1f51e6b365464 Mon Sep 17 00:00:00 2001
From: rem1776 <rem@pc0>
Date: Fri, 19 Jan 2024 09:45:32 -0500
Subject: [PATCH 14/15] add diffutils to image and remove install step

---
 .github/workflows/Dockerfile.gnu     | 2 +-
 .github/workflows/github_mom_gnu.yml | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/Dockerfile.gnu b/.github/workflows/Dockerfile.gnu
index 3506c2b9ee..86276c0b3e 100644
--- a/.github/workflows/Dockerfile.gnu
+++ b/.github/workflows/Dockerfile.gnu
@@ -55,7 +55,7 @@ COPY --from=builder /opt/deps/ /opt/deps/
 # need to be on the dev boxes if building
 COPY ./fms_test_input /home/unit_tests_input
 
-RUN dnf install -y autoconf make automake m4 libtool pkg-config zip
+RUN dnf install -y autoconf make automake m4 libtool pkg-config zip diffutils
 
 ENV FC="mpifort"
 ENV CC="mpicc"
diff --git a/.github/workflows/github_mom_gnu.yml b/.github/workflows/github_mom_gnu.yml
index e6a2998e19..5797d29d68 100644
--- a/.github/workflows/github_mom_gnu.yml
+++ b/.github/workflows/github_mom_gnu.yml
@@ -28,7 +28,5 @@ jobs:
         path: .testing/deps/fms/src
     - name: Build FMS and MOM test suite
       run: make -C .testing -j
-    - name: Install diff for testing
-      run: dnf install -y diffutils
     - name: Run MOM tests
       run: make -C .testing -j test

From efc79ac97b49c1c4b2dd2f079abf449b9dc901c2 Mon Sep 17 00:00:00 2001
From: Ryan Mulhall <Ryan.Mulhall@ldt-4742404.gfdl.noaa.gov>
Date: Wed, 13 Mar 2024 11:12:18 -0400
Subject: [PATCH 15/15] update to newer image and remove change to dockerfile

---
 .github/workflows/Dockerfile.gnu     | 2 +-
 .github/workflows/github_mom_gnu.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/Dockerfile.gnu b/.github/workflows/Dockerfile.gnu
index 86276c0b3e..3506c2b9ee 100644
--- a/.github/workflows/Dockerfile.gnu
+++ b/.github/workflows/Dockerfile.gnu
@@ -55,7 +55,7 @@ COPY --from=builder /opt/deps/ /opt/deps/
 # need to be on the dev boxes if building
 COPY ./fms_test_input /home/unit_tests_input
 
-RUN dnf install -y autoconf make automake m4 libtool pkg-config zip diffutils
+RUN dnf install -y autoconf make automake m4 libtool pkg-config zip
 
 ENV FC="mpifort"
 ENV CC="mpicc"
diff --git a/.github/workflows/github_mom_gnu.yml b/.github/workflows/github_mom_gnu.yml
index 5797d29d68..36735b7252 100644
--- a/.github/workflows/github_mom_gnu.yml
+++ b/.github/workflows/github_mom_gnu.yml
@@ -12,7 +12,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/noaa-gfdl/fms/fms-ci-rocky-gnu:12.3.0
+      image: ghcr.io/noaa-gfdl/fms/fms-ci-rocky-gnu:13.2.0
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.github_token }}