Infra Update v8: spack v1 Support

.github/workflows/cd.yml

@@ -10,12 +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 }}
-      root-sbd: access-esm1p5
-      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,14 +8,12 @@ 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@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
-      root-sbd: access-esm1p5
     permissions:
       pull-requests: write
       contents: write
@@ -24,22 +22,20 @@ 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@v8
     with:
       model: ${{ vars.NAME }}
-      root-sbd: access-esm1p5
     permissions:
       pull-requests: write
       contents: write
     secrets: inherit
   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@v8
     with:
       model: ${{ vars.NAME }}
       auto-configs-pr-schema-version: 1-0-0
-      root-sbd: access-esm1p5
     permissions:
       pull-requests: write
     secrets:

.github/workflows/ci.yml

@@ -18,15 +18,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@v8
     with:
       model: ${{ vars.NAME }}
-      root-sbd: access-esm1p5
-      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
@@ -36,7 +33,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: access-esm1p5
+    uses: access-nri/build-cd/.github/workflows/ci-closed.yml@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.03.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": "2026.02.002",
+  "custom-scopes": [
+    "ukmo-restricted-scope"
+  ]
 }

spack.yaml

@@ -3,53 +3,61 @@
 # 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-esm1p5]
+  - _version: [2024.12.1]
   specs:
-    - access-esm1p5@git.2024.12.1
+  - access-esm1p5
   packages:
     # Direct ACCESS-NRI dependencies
     # Note: some packages have branch-specific logic and hence can't use
     # the usual '@git.DATE' calver (https://calver.org) format, instead
     # requiring a `@git.DATE=BRANCH` version.
     mom5:
       require:
-        - '@git.access-esm1.5-2025.03.002=access-esm1.5'
+      - '@git.access-esm1.5-2025.03.002=access-esm1.5'
     cice4:
       require:
-        - '@git.access-esm1.5-2025.04.001=access-esm1.5'
+      - '@git.access-esm1.5-2025.04.001=access-esm1.5'
     um7:
       require:
-        - '@git.2024.10.17=access-esm1.5'
+      - '@git.2024.10.17=access-esm1.5'
     # Lower-level ACCESS-NRI dependencies
     gcom4:
       require:
-        - '@git.2024.05.28=access-esm1.5'
+      - '@git.2024.05.28=access-esm1.5'
     oasis3-mct:
       require:
-        - '@git.access-esm1.5_2024.05.24=access-esm1.5'
+      - '@git.access-esm1.5_2024.05.24=access-esm1.5'
     # Other dependencies
     openmpi:
       require:
-        - '@4.0.2'
+      - '@4.0.2'
     netcdf-c:
       require:
-        - '@4.7.4'
+      - '@4.7.4'
     netcdf-fortran:
       require:
-        - '@4.5.2'
+      - '@4.5.2'
     hdf5:
       require:
-        - '@1.10.11'
+      - '@1.10.11'
+    # Compilers
+    c:
+      require:
+      - intel-oneapi-compilers-classic@19.0.3.199
+    cxx:
+      require:
+      - intel-oneapi-compilers-classic@19.0.3.199
+    fortran:
+      require:
+      - intel-oneapi-compilers-classic@19.0.3.199
+
     # Preferences for all packages
     all:
-      require:
-        - '%intel@19.0.3.199'
-        - 'target=x86_64_v4'
+      prefer:
+      - '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