From 19739be26e59b4bf14454acd324cab9b20df92e8 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 18 Nov 2025 14:04:59 +1100 Subject: [PATCH 1/9] [no ci] infra: Update to v8 --- .github/workflows/cd.yml | 4 ++-- .github/workflows/ci.yml | 6 +++--- config/versions.json | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index c88109a..ba49ffe 100644 --- a/.github/workflows/cd.yml +++ b/.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 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 315ff4b..c2e43b8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -105,7 +105,7 @@ 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 }} @@ -113,7 +113,7 @@ jobs: # 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 +135,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 }} secrets: inherit diff --git a/config/versions.json b/config/versions.json index 3f477ad..c0da4ac 100644 --- a/config/versions.json +++ b/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.0", + "access-spack-packages": "2025.06.001" } From 82cac1f23984b649d2aa4a7686899d2c2137deee Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 09:49:20 +1100 Subject: [PATCH 2/9] [no ci] infra: Update spack version to v1.1, update manifest schema to 2-0-0 --- .github/workflows/cd.yml | 2 +- .github/workflows/ci.yml | 2 +- config/versions.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index ba49ffe..30bbebe 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -69,7 +69,7 @@ jobs: 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 + spack-manifest-schema-version: 2-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 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c2e43b8..57ce734 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -112,7 +112,7 @@ jobs: 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 + spack-manifest-schema-version: 2-0-0 config-versions-schema-version: 4-0-0 config-packages-schema-version: 1-0-0 permissions: diff --git a/config/versions.json b/config/versions.json index c0da4ac..f51ddc1 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/4-0-0.json", - "spack": "1.0", + "spack": "1.1", "access-spack-packages": "2025.06.001" } From 6e7d4cf82b16de584d006d1f7799b7e778dc985e Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 14:01:16 +1100 Subject: [PATCH 3/9] [no ci] spack.yaml: Dedent list elements for spack-style manifests --- gh/spack.yaml | 8 ++++---- ncdu/spack.yaml | 6 +++--- openssh/spack.yaml | 8 ++++---- pinentry/spack.yaml | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/gh/spack.yaml b/gh/spack.yaml index ccd0491..74de023 100644 --- a/gh/spack.yaml +++ b/gh/spack.yaml @@ -6,14 +6,14 @@ # This manifest is for installing gh, the GitHub command line interface spack: specs: - - gh@2.49.2 + - gh@2.49.2 packages: gh: require: - - '%gcc@14.1.0' + - '%gcc@14.1.0' all: require: - - 'target=x86_64' + - 'target=x86_64' view: true concretizer: unify: true @@ -21,6 +21,6 @@ spack: default: tcl: include: - - gh + - gh projections: gh: 'system-tools/{name}/{version}' diff --git a/ncdu/spack.yaml b/ncdu/spack.yaml index 878b108..f785c01 100644 --- a/ncdu/spack.yaml +++ b/ncdu/spack.yaml @@ -6,11 +6,11 @@ # This manifest is for installing ncdu, a terminal user interface for du (disk usage) spack: specs: - - ncdu@1.19 + - ncdu@1.19 packages: ncdu: require: - - '%gcc@14.1.0' + - '%gcc@14.1.0' view: true concretizer: unify: true @@ -18,6 +18,6 @@ spack: default: tcl: include: - - ncdu + - ncdu projections: ncdu: 'system-tools/{name}/{version}' diff --git a/openssh/spack.yaml b/openssh/spack.yaml index 603db6c..8e291dd 100644 --- a/openssh/spack.yaml +++ b/openssh/spack.yaml @@ -6,14 +6,14 @@ # This manifest is for installing openssh, a suite of secure networking utilities based on the SSH protocol spack: specs: - - openssh@9.9p1 + - openssh@9.9p1 packages: openssh: require: - - '%gcc@14.1.0' + - '%gcc@14.1.0' all: require: - - 'target=x86_64' + - 'target=x86_64' view: true concretizer: unify: true @@ -21,6 +21,6 @@ spack: default: tcl: include: - - openssh + - openssh projections: openssh: 'system-tools/{name}/{version}' diff --git a/pinentry/spack.yaml b/pinentry/spack.yaml index c69e3d5..f1aa632 100644 --- a/pinentry/spack.yaml +++ b/pinentry/spack.yaml @@ -6,11 +6,11 @@ # 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: specs: - - pinentry@1.3.0 gui=tty + - pinentry@1.3.0 gui=tty packages: pinentry: require: - - '%gcc@14.1.0' + - '%gcc@14.1.0' view: true concretizer: unify: true @@ -18,6 +18,6 @@ spack: default: tcl: include: - - pinentry + - pinentry projections: pinentry: 'system-tools/{name}/{version}' From 246ba19ab94d8f61bcd755b23e826815a2dbbe27 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 14:11:37 +1100 Subject: [PATCH 4/9] [no ci] spack.yaml: Add reserved defs, use toolchains --- gh/spack.yaml | 8 +++++++- ncdu/spack.yaml | 9 ++++++++- openssh/spack.yaml | 9 ++++++++- pinentry/spack.yaml | 10 +++++++++- 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/gh/spack.yaml b/gh/spack.yaml index 74de023..70dd447 100644 --- a/gh/spack.yaml +++ b/gh/spack.yaml @@ -5,12 +5,18 @@ # # This manifest is for installing gh, the GitHub command line interface spack: + definitions: + - _name: [gh] + - _version: [2.43.1] specs: - gh@2.49.2 packages: gh: require: - - '%gcc@14.1.0' + - '%access_gcc' + gcc: + require: + - '@14.1.0' all: require: - 'target=x86_64' diff --git a/ncdu/spack.yaml b/ncdu/spack.yaml index f785c01..b0eedf1 100644 --- a/ncdu/spack.yaml +++ b/ncdu/spack.yaml @@ -5,12 +5,19 @@ # # 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 packages: ncdu: require: - - '%gcc@14.1.0' + - '%access_gcc' + gcc: + require: + - '@14.1.0' view: true concretizer: unify: true diff --git a/openssh/spack.yaml b/openssh/spack.yaml index 8e291dd..a02fdc5 100644 --- a/openssh/spack.yaml +++ b/openssh/spack.yaml @@ -5,12 +5,19 @@ # # 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 packages: openssh: require: - - '%gcc@14.1.0' + - '%access_gcc' + gcc: + require: + - '@14.1.0' all: require: - 'target=x86_64' diff --git a/pinentry/spack.yaml b/pinentry/spack.yaml index f1aa632..09c8e44 100644 --- a/pinentry/spack.yaml +++ b/pinentry/spack.yaml @@ -5,12 +5,20 @@ # # 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 packages: pinentry: require: - - '%gcc@14.1.0' + - '%access_gcc' + + gcc: + require: + - '@14.1.0' view: true concretizer: unify: true From 6a206bcc50f0e0cc6af72f40c9f5a23322b1006e Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 8 Dec 2025 11:30:58 +1100 Subject: [PATCH 5/9] [no ci] .github.workflows: Revert to 1-0-0 tools-specific schema --- .github/workflows/cd.yml | 2 +- .github/workflows/ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 30bbebe..ba49ffe 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -69,7 +69,7 @@ jobs: 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: 2-0-0 + spack-manifest-schema-version: 1-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 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 57ce734..c2e43b8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -112,7 +112,7 @@ jobs: 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: 2-0-0 + spack-manifest-schema-version: 1-0-0 config-versions-schema-version: 4-0-0 config-packages-schema-version: 1-0-0 permissions: From bd63856fe3165790d1fb1729e58cd189a6dbf5e6 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 20 Jan 2026 15:42:32 +1100 Subject: [PATCH 6/9] [no ci] Remove inputs.pr, add inputs.spack-manifest-path to ci-closed --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c2e43b8..0747138 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -108,7 +108,6 @@ jobs: 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 @@ -137,5 +136,5 @@ jobs: manifest: ${{ fromJson(needs.setup-pr.outputs.manifest) }} 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 From a4490b79b9ed2d6945392272a58a9535a30c5a56 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Wed, 11 Feb 2026 09:02:56 +1100 Subject: [PATCH 7/9] [no ci] Update config/versions.json access-spack-packages version to common api-v2 tag --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index f51ddc1..ef5f303 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$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" + "access-spack-packages": "2026.02.002" } From d5ea314e466ffab11ceb405b1209ebb672724294 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 13 Feb 2026 16:29:23 +1100 Subject: [PATCH 8/9] TEST: Add test branch --- .github/workflows/cd.yml | 2 +- .github/workflows/ci.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index ba49ffe..c409d04 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -63,7 +63,7 @@ jobs: max-parallel: 1 matrix: manifest: ${{ fromJson(needs.setup-cd.outputs.manifest) }} - uses: access-nri/build-cd/.github/workflows/cd.yml@v8 + uses: access-nri/build-cd/.github/workflows/cd.yml@test-v8 with: model: ${{ matrix.manifest.name }} spack-manifest-path: ${{ matrix.manifest.path }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0747138..0fcdfce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -105,7 +105,7 @@ jobs: max-parallel: 1 matrix: manifest: ${{ fromJson(needs.setup-pr.outputs.manifest) }} - uses: access-nri/build-cd/.github/workflows/ci.yml@v8 + uses: access-nri/build-cd/.github/workflows/ci.yml@test-v8 with: model: ${{ matrix.manifest.name }} spack-manifest-path: ${{ matrix.manifest.path }} @@ -134,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@v8 + uses: access-nri/build-cd/.github/workflows/ci-closed.yml@test-v8 with: spack-manifest-path: ${{ matrix.manifest.path }} secrets: inherit From e07f138918790cfd9ce4904f05ae530814cc3c4d Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 13 Feb 2026 16:29:49 +1100 Subject: [PATCH 9/9] Update manifests to language requirements --- gh/spack.yaml | 15 ++++++++++----- ncdu/spack.yaml | 18 +++++++++++++----- openssh/spack.yaml | 15 ++++++++++----- pinentry/spack.yaml | 17 ++++++++++++----- 4 files changed, 45 insertions(+), 20 deletions(-) diff --git a/gh/spack.yaml b/gh/spack.yaml index 70dd447..ebf56c5 100644 --- a/gh/spack.yaml +++ b/gh/spack.yaml @@ -11,14 +11,19 @@ spack: specs: - gh@2.49.2 packages: - gh: + # Compilers + c: require: - - '%access_gcc' - gcc: + - 'gcc@14.1.0' + cxx: require: - - '@14.1.0' - all: + - 'gcc@14.1.0' + fortran: require: + - 'gcc@14.1.0' + + all: + prefer: - 'target=x86_64' view: true concretizer: diff --git a/ncdu/spack.yaml b/ncdu/spack.yaml index b0eedf1..d40de51 100644 --- a/ncdu/spack.yaml +++ b/ncdu/spack.yaml @@ -8,16 +8,24 @@ spack: definitions: # _name and _version are reserved definitions that inform build-cd deployments, and have no effect otherwise - _name: [ncdu] - - _version: [1.19] + - _version: ['1.19'] specs: - ncdu@1.19 packages: - ncdu: + # Compilers + c: require: - - '%access_gcc' - gcc: + - 'gcc@14.1.0' + cxx: require: - - '@14.1.0' + - 'gcc@14.1.0' + fortran: + require: + - 'gcc@14.1.0' + + all: + prefer: + - 'target=x86_64' view: true concretizer: unify: true diff --git a/openssh/spack.yaml b/openssh/spack.yaml index a02fdc5..a008dea 100644 --- a/openssh/spack.yaml +++ b/openssh/spack.yaml @@ -12,14 +12,19 @@ spack: specs: - openssh@9.9p1 packages: - openssh: + # Compilers + c: require: - - '%access_gcc' - gcc: + - 'gcc@14.1.0' + cxx: require: - - '@14.1.0' - all: + - 'gcc@14.1.0' + fortran: require: + - 'gcc@14.1.0' + + all: + prefer: - 'target=x86_64' view: true concretizer: diff --git a/pinentry/spack.yaml b/pinentry/spack.yaml index 09c8e44..0f7ebd6 100644 --- a/pinentry/spack.yaml +++ b/pinentry/spack.yaml @@ -12,13 +12,20 @@ spack: specs: - pinentry@1.3.0 gui=tty packages: - pinentry: + # Compilers + c: require: - - '%access_gcc' - - gcc: + - 'gcc@14.1.0' + cxx: + require: + - 'gcc@14.1.0' + fortran: require: - - '@14.1.0' + - 'gcc@14.1.0' + + all: + prefer: + - 'target=x86_64' view: true concretizer: unify: true