Merge branch 'main' into oneapi-test

ACCESS-NRI · Feb 25, 2025 · 525cac6 · 525cac6
2 parents b83e2e0 + b300a6c
commit 525cac6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -10,9 +10,11 @@ on:
 jobs:
   cd:
     name: CD
-    uses: access-nri/build-cd/.github/workflows/cd.yml@v3
+    uses: access-nri/build-cd/.github/workflows/cd.yml@v4
     with:
       model: ${{ vars.NAME }}
     permissions:
       contents: write
+      # Required because later workflows also handle on.pull_request trigger
+      pull-requests: write
     secrets: inherit
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
     if: >-
       (github.event_name == 'pull_request' && github.event.action != 'closed') ||
       (github.event_name == 'issue_comment' && startsWith(github.event.comment.body, '!redeploy'))
-    uses: access-nri/build-cd/.github/workflows/ci.yml@v3
+    uses: access-nri/build-cd/.github/workflows/ci.yml@v4
     with:
       model: ${{ vars.NAME }}
       pr: ${{ github.event_name == 'pull_request' && github.event.pull_request.number || github.event.issue.number }}
@@ -40,7 +40,7 @@ jobs:
     # This job is responsible for handling Command Comments like
     # `!bump` during an open PR
     if: github.event_name == 'issue_comment'
-    uses: access-nri/build-cd/.github/workflows/ci-comment.yml@v3
+    uses: access-nri/build-cd/.github/workflows/ci-comment.yml@v4
     with:
       model: ${{ vars.NAME }}
     permissions:
@@ -53,7 +53,7 @@ jobs:
     # This job is responsible for cleaning up the Prereleases after a
     # PR is closed
     if: github.event_name == 'pull_request' && github.event.action == 'closed'
-    uses: access-nri/build-cd/.github/workflows/ci-closed.yml@v3
+    uses: access-nri/build-cd/.github/workflows/ci-closed.yml@v4
     with:
-      model: ${{ vars.NAME }}
+      root-sbd: ${{ vars.NAME }}
     secrets: inherit  # inherit GitHub Deployment environment secrets
diff --git a/spack.yaml b/spack.yaml
@@ -12,11 +12,13 @@ spack:
     access-om3-nuopc:
       require:
         - '@git.0.4.0'
+        - +mom_symmetric
+        - configurations=MOM6,MOM6-CICE6,MOM6-CICE6-WW3
 
     # Other Dependencies
     esmf:
       require:
-        - '@8.5.0'
+        - '@git.v8.7.0'
     parallelio:
       require:
         - '@2.6.2'
@@ -29,10 +31,10 @@ spack:
         - '@4.6.1'
     fms:
       require:
-        - '@2023.02'
+        - '@git.2024.03'
     openmpi:
       require:
-        - '@4.1.5'
+        - '@4.1.7'
     fortranxml:
       require:
         - '@4.1.2'
@@ -54,5 +56,5 @@ spack:
           - access-om3
           - access-om3-nuopc
         projections:
-          access-om3: '{name}/2024.09.0'
-          access-om3-nuopc: '{name}/0.3.1-{hash:7}'
+          access-om3: '{name}/2025.01.0'
+          access-om3-nuopc: '{name}/0.4.0-{hash:7}'