Infra Update v8: spack v1 Support

.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@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.yml

@@ -17,14 +17,13 @@ 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@v8
     with:
       model: ${{ vars.NAME }}
       pr: ${{ github.event.pull_request.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
@@ -34,7 +33,7 @@ jobs:
   pr-closed:
     name: Closed
     if: github.event.action == 'closed'
-    uses: access-nri/build-cd/.github/workflows/ci-closed.yml@v7
+    uses: access-nri/build-cd/.github/workflows/ci-closed.yml@v8
     with:
       root-sbd: ${{ vars.NAME }}
     secrets: inherit

config/versions.json

@@ -1,5 +1,6 @@
 {
-    "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json",
-    "spack": "0.22",
-    "spack-packages": "2025.09.004"
+  "$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": "2025.09.004",
+  "custom-scopes": ["ukmo-restricted-scope"]
 }

spack.yaml

@@ -3,51 +3,53 @@
 # 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-am3]
+  - _version: [2025.10.000]
   specs:
-    - access-am3@git.2025.10.000
+  - access-am3
   packages:
     # Direct dependencies
     um:
       require:
-        - '@13.1'
-        - model="vn13p1-am"
-        - jules_ref="2025.08.0"
-        - um_ref="2025.08.0"
+      - '@13.1'
+      - model="vn13p1-am"
+      - jules_ref="2025.08.0"
+      - um_ref="2025.08.0"
 
     # Indirect dependencies
     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:
-        - '@7.9'
+      - '@7.9'
 
     openmpi:
       require:
-        - '@4.1.7'
+      - '@4.1.7'
+    # Compilers
+    intel-oneapi-compilers-classic:
+      require:
+      - '@2021.10.0'
 
     # Specifications that apply to all packages
     all:
       require:
-        - '%intel@2021.10.0'
-        - target=x86_64_v4
+      - '%access_intel'
+      - target=x86_64_v4
   view: true
   concretizer:
     unify: true
-  config:
-    install_tree:
-      root: $spack/../restricted/ukmo/release
-    source_cache: $spack/../restricted/ukmo/source_cache
-    build_stage:
-    - $TMPDIR/restricted/spack-stage