Depend on DR_HOOK

.github/workflows/cd.yml

@@ -10,11 +10,11 @@ on:
 jobs:
   cd:
     name: CD
-    uses: access-nri/build-cd/.github/workflows/cd.yml@v7
+    uses: access-nri/build-cd/.github/workflows/cd.yml@test-v8
     with:
       model: ${{ vars.NAME }}
-      spack-manifest-schema-version: 1-0-7
-      config-versions-schema-version: 3-0-0
+      spack-manifest-schema-version: 2-0-0
+      config-versions-schema-version: 4-0-0
       config-packages-schema-version: 1-0-0
     permissions:
       contents: write

.github/workflows/ci-command.yml

@@ -8,12 +8,11 @@ jobs:
   redeploy:
     name: Redeploy
     if: startsWith(github.event.comment.body, '!redeploy') && github.event.issue.pull_request
-    uses: access-nri/build-cd/.github/workflows/ci.yml@v7
+    uses: access-nri/build-cd/.github/workflows/ci.yml@test-v8
     with:
       model: ${{ vars.NAME }}
-      pr: ${{ github.event.issue.number }}
-      spack-manifest-schema-version: 1-0-7
-      config-versions-schema-version: 3-0-0
+      spack-manifest-schema-version: 2-0-0
+      config-versions-schema-version: 4-0-0
       config-packages-schema-version: 1-0-0
     permissions:
       pull-requests: write
@@ -23,7 +22,7 @@ jobs:
   bump:
     name: Bump
     if: startsWith(github.event.comment.body, '!bump') && github.event.issue.pull_request
-    uses: access-nri/build-cd/.github/workflows/ci-comment.yml@v7
+    uses: access-nri/build-cd/.github/workflows/ci-comment.yml@test-v8
     with:
       model: ${{ vars.NAME }}
     permissions:
@@ -33,7 +32,7 @@ jobs:
   configs:
     name: Configs
     if: startsWith(github.event.comment.body, '!update-configs') && github.event.issue.pull_request
-    uses: access-nri/build-cd/.github/workflows/ci-command-configs.yml@v7
+    uses: access-nri/build-cd/.github/workflows/ci-command-configs.yml@test-v8
     with:
       model: ${{ vars.NAME }}
       auto-configs-pr-schema-version: 1-0-0

.github/workflows/ci.yml

@@ -19,16 +19,12 @@ on:
 jobs:
   pr-ci:
     name: CI
-    if: >-
-      github.event.action != 'closed'
-    uses: access-nri/build-cd/.github/workflows/ci.yml@v7
+    if: github.event.action != 'closed'
+    uses: access-nri/build-cd/.github/workflows/ci.yml@test-v8
     with:
-      pr: ${{ github.event.pull_request.number }}
       model: ${{ vars.NAME }}
-      # root-sbd: if different from vars.NAME
-
-      spack-manifest-schema-version: 1-0-7
-      config-versions-schema-version: 3-0-0
+      spack-manifest-schema-version: 2-0-0
+      config-versions-schema-version: 4-0-0
       config-packages-schema-version: 1-0-0
     permissions:
       pull-requests: write
@@ -38,7 +34,5 @@ jobs:
   pr-closed:
     name: Closed
     if: github.event.action == 'closed'
-    uses: access-nri/build-cd/.github/workflows/ci-closed.yml@v7
-    with:
-      root-sbd: ${{ vars.NAME }}
+    uses: access-nri/build-cd/.github/workflows/ci-closed.yml@test-v8
     secrets: inherit

config/versions.json

@@ -1,5 +1,8 @@
 {
-    "$schema": "https://github.com/ACCESS-NRI/schema/blob/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json",
-    "spack": "0.22",
-    "spack-packages": "2025.07.006"
+  "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/4-0-0.json",
+  "spack": "1.1",
+  "access-spack-packages": "a8e7d8a5c82b68de2afc3646ffc48aae256bee12",
+  "custom-scopes": [
+    "ukmo-restricted-scope"
+  ]
 }

spack.yaml

@@ -3,43 +3,57 @@
 # It describes a set of packages to be installed, along with
 # configuration settings.
 spack:
+  definitions:
+  # _name and _version are reserved definitions that inform build-cd deployments, and have no effect otherwise
+  - _name: [access-ram3]
+  - _version: [2025.08.000]
   specs:
-    - access-ram3@git.2025.08.000
+  - access-ram3
   packages:
     # Direct dependencies
     um:
       require:
-        - '@13.5'
-        - model="vn13p5-rns"
-        - ~DR_HOOK
-        - +eccodes
+      - '@13.5'
+      - model="vn13p5-rns"
+      - +DR_HOOK
+      - +eccodes
     # Indirect dependencies
     eccodes:
       require:
-        - '@2.34.0'
-        - '+memfs'
+      - '@2.34.0'
+      - '+memfs'
     netcdf-c:
       require:
-        - '@4.9.2'
+      - '@4.9.2'
     netcdf-fortran:
       require:
-        - '@4.5.2'
+      - '@4.5.2'
     fcm:
       require:
-        - '@2021.05.0'
-        # TODO: Generalize this Gadi-specific variant for spack.yaml
-        - 'site=nci-gadi'
+      - '@2021.05.0'
+      # TODO: Generalize this Gadi-specific variant for spack.yaml
+      - 'site=nci-gadi'
     gcom:
       require:
-        - '@8.3'
+      - '@8.3'
+      # Temporary change to trigger redeploy
     openmpi:
       require:
-        - '@4.1.7'
+      - '@4.1.7'
+    # Compilers
+    c:
+      require:
+      - intel-oneapi-compilers-classic@2021.10.0
+    cxx:
+      require:
+      - intel-oneapi-compilers-classic@2021.10.0
+    fortran:
+      require:
+      - intel-oneapi-compilers-classic@2021.10.0
     # Specifications that apply to all packages
     all:
-      require:
-        - '%intel@2021.10.0'
-        - target=x86_64_v4
+      prefer:
+      - target=x86_64_v4
   view: true
   concretizer:
     unify: true
@@ -51,9 +65,3 @@ spack:
           environment:
             set:
               'SPACK_{name}_ROOT': '{prefix}'
-  config:
-    install_tree:
-      root: $spack/../restricted/ukmo/release
-    source_cache: $spack/../restricted/ukmo/source_cache
-    build_stage:
-      - $TMPDIR/restricted/spack-stage