Infra Update v8: spack v1 Support

.github/workflows/cd.yml

@@ -63,14 +63,14 @@ jobs:
       max-parallel: 1
       matrix:
         manifest: ${{ fromJson(needs.setup-cd.outputs.manifest) }}
-    uses: access-nri/build-cd/.github/workflows/cd.yml@v7
+    uses: access-nri/build-cd/.github/workflows/cd.yml@v8
     with:
       model: ${{ matrix.manifest.name }}
       spack-manifest-path: ${{ matrix.manifest.path }}
       # We have a custom schema for general software deployment manifests, so we specify it here
       spack-manifest-schema-path: au.org.access-nri/tools/spack/environment/deployment
       spack-manifest-schema-version: 1-0-0
-      config-versions-schema-version: 3-0-0
+      config-versions-schema-version: 4-0-0
       config-packages-schema-version: 1-0-0
       # This is a non-model deployment repository, so we do not want to tag the deployment or upload to the build database
       tag-deployment: false

.github/workflows/ci.yml

@@ -105,15 +105,14 @@ jobs:
       max-parallel: 1
       matrix:
         manifest: ${{ fromJson(needs.setup-pr.outputs.manifest) }}
-    uses: access-nri/build-cd/.github/workflows/ci.yml@v7
+    uses: access-nri/build-cd/.github/workflows/ci.yml@v8
     with:
       model: ${{ matrix.manifest.name }}
-      pr: ${{ github.event_name == 'pull_request' && github.event.pull_request.number || github.event.issue.number }}
       spack-manifest-path: ${{ matrix.manifest.path }}
       # We have a custom schema for general software deployment manifests, so we specify it here
       spack-manifest-schema-path: au.org.access-nri/tools/spack/environment/deployment
       spack-manifest-schema-version: 1-0-0
-      config-versions-schema-version: 3-0-0
+      config-versions-schema-version: 4-0-0
       config-packages-schema-version: 1-0-0
     permissions:
       pull-requests: write
@@ -135,7 +134,7 @@ jobs:
       max-parallel: 1
       matrix:
         manifest: ${{ fromJson(needs.setup-pr.outputs.manifest) }}
-    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: ${{ matrix.manifest.name }}
+      spack-manifest-path: ${{ matrix.manifest.path }}
     secrets: inherit

config/versions.json

@@ -1,5 +1,5 @@
 {
-    "$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.06.001"
+  "$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.06.001"
 }

gh/spack.yaml

@@ -5,22 +5,28 @@
 #
 # This manifest is for installing gh, the GitHub command line interface
 spack:
+  definitions:
+  - _name: [gh]
+  - _version: [2.43.1]
   specs:
-    - gh@2.49.2
+  - gh@2.49.2
   packages:
     gh:
       require:
-        - '%gcc@14.1.0'
+      - '%access_gcc'
+    gcc:
+      require:
+      - '@14.1.0'
     all:
       require:
-        - 'target=x86_64'
+      - 'target=x86_64'
   view: true
   concretizer:
     unify: true
   modules:
     default:
       tcl:
         include:
-          - gh
+        - gh
         projections:
           gh: 'system-tools/{name}/{version}'

ncdu/spack.yaml

@@ -5,19 +5,26 @@
 #
 # This manifest is for installing ncdu, a terminal user interface for du (disk usage)
 spack:
+  definitions:
+  # _name and _version are reserved definitions that inform build-cd deployments, and have no effect otherwise
+  - _name: [ncdu]
+  - _version: [1.19]
   specs:
-    - ncdu@1.19
+  - ncdu@1.19
   packages:
     ncdu:
       require:
-        - '%gcc@14.1.0'
+      - '%access_gcc'
+    gcc:
+      require:
+      - '@14.1.0'
   view: true
   concretizer:
     unify: true
   modules:
     default:
       tcl:
         include:
-          - ncdu
+        - ncdu
         projections:
           ncdu: 'system-tools/{name}/{version}'

openssh/spack.yaml

@@ -5,22 +5,29 @@
 #
 # This manifest is for installing openssh, a suite of secure networking utilities based on the SSH protocol
 spack:
+  definitions:
+  # _name and _version are reserved definitions that inform build-cd deployments, and have no effect otherwise
+  - _name: [openssh]
+  - _version: [9.8p1]
   specs:
-    - openssh@9.9p1
+  - openssh@9.9p1
   packages:
     openssh:
       require:
-        - '%gcc@14.1.0'
+      - '%access_gcc'
+    gcc:
+      require:
+      - '@14.1.0'
     all:
       require:
-        - 'target=x86_64'
+      - 'target=x86_64'
   view: true
   concretizer:
     unify: true
   modules:
     default:
       tcl:
         include:
-          - openssh
+        - openssh
         projections:
           openssh: 'system-tools/{name}/{version}'

pinentry/spack.yaml

@@ -5,19 +5,27 @@
 #
 # This manifest is for installing pinentry, a small collection of dialog programs that allow GnuPG to read passphrases and PIN numbers in a secure manner.
 spack:
+  definitions:
+  # _name and _version are reserved definitions that inform build-cd deployments, and have no effect otherwise
+  - _name: [pinentry]
+  - _version: [1.3.0]
   specs:
-    - pinentry@1.3.0 gui=tty
+  - pinentry@1.3.0 gui=tty
   packages:
     pinentry:
       require:
-        - '%gcc@14.1.0'
+      - '%access_gcc'
+
+    gcc:
+      require:
+      - '@14.1.0'
   view: true
   concretizer:
     unify: true
   modules:
     default:
       tcl:
         include:
-          - pinentry
+        - pinentry
         projections:
           pinentry: 'system-tools/{name}/{version}'