diff --git a/.github/workflows/fleximod_test.yaml b/.github/workflows/fleximod_test.yaml index 24bcac95d..f18dab136 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 @@ -16,7 +16,12 @@ jobs: - id: run-fleximod run: | $GITHUB_WORKSPACE/bin/git-fleximod update - $GITHUB_WORKSPACE/bin/git-fleximod test + echo + echo "Update complete, checking status" + echo + $GITHUB_WORKSPACE/bin/git-fleximod status | tee status.out + grep testfails status.out || exit 0 + exit 1 # - name: Setup tmate session # if: ${{ failure() }} # uses: mxschmitt/action-tmate@v3 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