From a1f696a47eca2d89d0f3513afb131e8e699de3af Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 18 Nov 2025 14:08:39 +1100 Subject: [PATCH 1/6] [no ci] infra: Update to v8 --- .github/workflows/cd.yml | 6 +++--- .github/workflows/ci.yml | 11 +++++------ config/versions.json | 6 +++--- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 624ee52..aaf69b0 100644 --- a/.github/workflows/cd.yml +++ b/.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 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ef56a62..925d857 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,15 +19,14 @@ 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: if different from 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 @@ -37,7 +36,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: access-test secrets: inherit diff --git a/config/versions.json b/config/versions.json index 3b948ab..8de05d6 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { - "$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": "main" + "$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": "main" } From 4f9dee0223b2ac908466a65b9f810d6fd0c2f8e5 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 09:50:35 +1100 Subject: [PATCH 2/6] [no ci] infra: Update spack version to v1.1, update manifest schema to 2-0-0 --- config/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/versions.json b/config/versions.json index 8de05d6..6c0c900 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": "main" } From a9412bf064e4ca9426a62b5b067539c777612420 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 16:46:02 +1100 Subject: [PATCH 3/6] [no ci] spack.yaml: Dedent list elements for spack-style manifests --- spack.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/spack.yaml b/spack.yaml index b560db6..b2a9c29 100644 --- a/spack.yaml +++ b/spack.yaml @@ -4,21 +4,21 @@ # configuration settings. spack: specs: - - access-test@git.2025.09.000 + - access-test@git.2025.09.000 packages: access-test-component: require: - - '@main' + - '@main' openmpi: require: - - '@4.1.5' + - '@4.1.5' gcc-runtime: require: - - '%gcc' + - '%gcc' all: require: - - '%intel@2021.10.0' - - 'target=x86_64' + - '%intel@2021.10.0' + - 'target=x86_64' view: true concretizer: unify: true From b15e4ba29aaafae445f4d8534d10b476a1e00af1 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 16:46:51 +1100 Subject: [PATCH 4/6] [no ci] spack.yaml: Add reserved definitions --- spack.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/spack.yaml b/spack.yaml index b2a9c29..30cd600 100644 --- a/spack.yaml +++ b/spack.yaml @@ -3,8 +3,12 @@ # 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-test] + - _version: [2025.09.000] specs: - - access-test@git.2025.09.000 + - access-test packages: access-test-component: require: From 43786b49ea536d1176021d2dab36a8d7a1b873f8 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 16:47:52 +1100 Subject: [PATCH 5/6] [no ci] spack.yaml: Use toolchains --- spack.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/spack.yaml b/spack.yaml index 30cd600..bd1a95d 100644 --- a/spack.yaml +++ b/spack.yaml @@ -18,10 +18,16 @@ spack: - '@4.1.5' gcc-runtime: require: - - '%gcc' + - '%access_gcc' + + # Compilers + intel-oneapi-compilers-classic: + require: + - '@2021.10.0' + all: require: - - '%intel@2021.10.0' + - '%access_intel' - 'target=x86_64' view: true concretizer: From 98f0c8148527e45e39d6f81b76de18c66c230d59 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 20 Jan 2026 14:14:29 +1100 Subject: [PATCH 6/6] Update entrypoints for testing --- .github/workflows/cd.yml | 2 +- .github/workflows/ci-command.yml | 7 +++---- .github/workflows/ci.yml | 8 ++------ config/versions.json | 2 +- spack.yaml | 2 +- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index aaf69b0..9a9a4f7 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -10,7 +10,7 @@ on: jobs: cd: name: CD - uses: access-nri/build-cd/.github/workflows/cd.yml@v8 + uses: access-nri/build-cd/.github/workflows/cd.yml@342-name-reserved-def-as-sbr_TEST with: model: ${{ vars.NAME }} spack-manifest-schema-version: 2-0-0 diff --git a/.github/workflows/ci-command.yml b/.github/workflows/ci-command.yml index b06012e..7aca68f 100644 --- a/.github/workflows/ci-command.yml +++ b/.github/workflows/ci-command.yml @@ -8,10 +8,9 @@ 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@342-name-reserved-def-as-sbr_TEST with: model: ${{ vars.NAME }} - pr: ${{ github.event.issue.number }} spack-manifest-schema-version: 1-0-7 config-versions-schema-version: 3-0-0 config-packages-schema-version: 1-0-0 @@ -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@342-name-reserved-def-as-sbr_TEST 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@342-name-reserved-def-as-sbr_TEST with: model: ${{ vars.NAME }} auto-configs-pr-schema-version: 1-0-0 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 925d857..133bd3f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,11 +20,9 @@ jobs: pr-ci: name: CI if: github.event.action != 'closed' - uses: access-nri/build-cd/.github/workflows/ci.yml@v8 + uses: access-nri/build-cd/.github/workflows/ci.yml@342-name-reserved-def-as-sbr_TEST with: model: ${{ vars.NAME }} - # root-sbd: if different from vars.NAME - pr: ${{ github.event.pull_request.number }} spack-manifest-schema-version: 2-0-0 config-versions-schema-version: 4-0-0 config-packages-schema-version: 1-0-0 @@ -36,7 +34,5 @@ jobs: pr-closed: name: Closed if: github.event.action == 'closed' - uses: access-nri/build-cd/.github/workflows/ci-closed.yml@v8 - with: - root-sbd: access-test + uses: access-nri/build-cd/.github/workflows/ci-closed.yml@342-name-reserved-def-as-sbr_TEST secrets: inherit diff --git a/config/versions.json b/config/versions.json index 6c0c900..1e564d9 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": "main" + "access-spack-packages": "api-v2" } diff --git a/spack.yaml b/spack.yaml index bd1a95d..d74cc86 100644 --- a/spack.yaml +++ b/spack.yaml @@ -1,4 +1,4 @@ -# This is a Spack Environment file. +# This is a Spack Environment file! # # It describes a set of packages to be installed, along with # configuration settings.