From da00d8fc87126b8c3411556849631d1a72869777 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 27 Sep 2024 15:56:00 -0600 Subject: [PATCH 1/7] add alphabranch to tests --- .github/workflows/fleximod_test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/fleximod_test.yaml b/.github/workflows/fleximod_test.yaml index 24bcac95d..09044afed 100644 --- a/.github/workflows/fleximod_test.yaml +++ b/.github/workflows/fleximod_test.yaml @@ -1,8 +1,8 @@ on: push: - branches: [ master ] + branches: [ master, cesm3.0-alphabranch ] pull_request: - branches: [ master ] + branches: [ master, cesm3.0-alphabranch ] jobs: fleximod-test: runs-on: ubuntu-latest From 01ce65f0b841be547402933257a2b4fe44bf623d Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 27 Sep 2024 16:15:07 -0600 Subject: [PATCH 2/7] try another method --- .github/workflows/fleximod_test.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/fleximod_test.yaml b/.github/workflows/fleximod_test.yaml index 09044afed..f8ae9b56e 100644 --- a/.github/workflows/fleximod_test.yaml +++ b/.github/workflows/fleximod_test.yaml @@ -16,7 +16,8 @@ jobs: - id: run-fleximod run: | $GITHUB_WORKSPACE/bin/git-fleximod update - $GITHUB_WORKSPACE/bin/git-fleximod test + $GITHUB_WORKSPACE/bin/git-fleximod status | grep -c 'testfails = 0' + # - name: Setup tmate session # if: ${{ failure() }} # uses: mxschmitt/action-tmate@v3 From a891234ef9e6d4244e8c0cb4eb373c08bf65052b Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 27 Sep 2024 16:19:07 -0600 Subject: [PATCH 3/7] try another method --- .github/workflows/fleximod_test.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/fleximod_test.yaml b/.github/workflows/fleximod_test.yaml index f8ae9b56e..8e4362bcc 100644 --- a/.github/workflows/fleximod_test.yaml +++ b/.github/workflows/fleximod_test.yaml @@ -16,7 +16,8 @@ jobs: - id: run-fleximod run: | $GITHUB_WORKSPACE/bin/git-fleximod update - $GITHUB_WORKSPACE/bin/git-fleximod status | grep -c 'testfails = 0' + $GITHUB_WORKSPACE/bin/git-fleximod status | tee status.out + grep -c 'testfails = 0' status.out # - name: Setup tmate session # if: ${{ failure() }} From 4ee72ee42a46bae25cf0d4214c1fe7f38e1a0d90 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 27 Sep 2024 16:24:18 -0600 Subject: [PATCH 4/7] try another method --- .github/workflows/fleximod_test.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/fleximod_test.yaml b/.github/workflows/fleximod_test.yaml index 8e4362bcc..7b87a7e2b 100644 --- a/.github/workflows/fleximod_test.yaml +++ b/.github/workflows/fleximod_test.yaml @@ -16,8 +16,11 @@ jobs: - id: run-fleximod run: | $GITHUB_WORKSPACE/bin/git-fleximod update + echo + echo "Update complete, checking status" + echo $GITHUB_WORKSPACE/bin/git-fleximod status | tee status.out - grep -c 'testfails = 0' status.out + grep 'testfails = 0' status.out # - name: Setup tmate session # if: ${{ failure() }} From b60e7614da3fac767d2f308f5d7480fd073314ac Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 27 Sep 2024 16:26:01 -0600 Subject: [PATCH 5/7] update all submodules --- .gitmodules | 4 ++-- cime | 2 +- components/clm | 2 +- components/mom | 2 +- components/ww3 | 2 +- tools/CUPiD | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitmodules b/.gitmodules index 431bb5c3b..a47f1cc8b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -80,7 +80,7 @@ url = https://github.com/ESCOMP/MOM_interface fxDONOTUSEurl = https://github.com/ESCOMP/MOM_interface fxrequired = ToplevelRequired - fxtag = mi_240823 + fxtag = mi_240923 [submodule "cism"] path = components/cism @@ -114,7 +114,7 @@ path = components/ww3 url = https://github.com/ESCOMP/WW3_interface fxDONOTUSEurl = https://github.com/ESCOMP/WW3_interface - fxtag = ww3i_0.0.14 + fxtag = main_0.0.14 fxrequired = ToplevelRequired [submodule "mizuroute"] diff --git a/cime b/cime index 95c5196ab..2776043f0 160000 --- a/cime +++ b/cime @@ -1 +1 @@ -Subproject commit 95c5196ab0ff1d0ae16198249c955da5f685cb4f +Subproject commit 2776043f0d20d2bc1094afeb48e0cc242b0b0407 diff --git a/components/clm b/components/clm index 0999a32f5..a3459c540 160000 --- a/components/clm +++ b/components/clm @@ -1 +1 @@ -Subproject commit 0999a32f520c995c3dfc94b9b96781d20ed0d6d5 +Subproject commit a3459c54022057a2d5711c7fffdf5b3524623857 diff --git a/components/mom b/components/mom index 52c30e9b2..298d20a2a 160000 --- a/components/mom +++ b/components/mom @@ -1 +1 @@ -Subproject commit 52c30e9b2115a6f14b9ad124b2967035878decdd +Subproject commit 298d20a2a0c952eb185f8641e304028a4a58d5b5 diff --git a/components/ww3 b/components/ww3 index 04e2f1d9d..d16f7c8fd 160000 --- a/components/ww3 +++ b/components/ww3 @@ -1 +1 @@ -Subproject commit 04e2f1d9d98f24608235fe3bb9466a6f286897fb +Subproject commit d16f7c8fdefb51385703f5821942a0c124812323 diff --git a/tools/CUPiD b/tools/CUPiD index 5c2b957b7..5cad93329 160000 --- a/tools/CUPiD +++ b/tools/CUPiD @@ -1 +1 @@ -Subproject commit 5c2b957b783c2df863817a93abf73786d7acbe3e +Subproject commit 5cad933293165959621ba282a42f3b54945415ea From e05c5d2709c1b22892f0b94cc78d826955361446 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 27 Sep 2024 16:52:13 -0600 Subject: [PATCH 6/7] update all submodules --- .github/workflows/fleximod_test.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/fleximod_test.yaml b/.github/workflows/fleximod_test.yaml index 7b87a7e2b..8e4fa827d 100644 --- a/.github/workflows/fleximod_test.yaml +++ b/.github/workflows/fleximod_test.yaml @@ -20,8 +20,10 @@ jobs: echo "Update complete, checking status" echo $GITHUB_WORKSPACE/bin/git-fleximod status | tee status.out - grep 'testfails = 0' status.out - + grep testfails status.out + if [[ $? -eq 0 ]]; then + exit 1 + fi # - name: Setup tmate session # if: ${{ failure() }} # uses: mxschmitt/action-tmate@v3 From 1805f355b166e3d57e451751c40e675814f743b7 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 27 Sep 2024 17:15:51 -0600 Subject: [PATCH 7/7] try again --- .github/workflows/fleximod_test.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/fleximod_test.yaml b/.github/workflows/fleximod_test.yaml index 8e4fa827d..f18dab136 100644 --- a/.github/workflows/fleximod_test.yaml +++ b/.github/workflows/fleximod_test.yaml @@ -20,10 +20,8 @@ jobs: echo "Update complete, checking status" echo $GITHUB_WORKSPACE/bin/git-fleximod status | tee status.out - grep testfails status.out - if [[ $? -eq 0 ]]; then - exit 1 - fi + grep testfails status.out || exit 0 + exit 1 # - name: Setup tmate session # if: ${{ failure() }} # uses: mxschmitt/action-tmate@v3