From 01fa961c300fd3e239e2e0c526d7dbed58f9a626 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Mon, 17 Nov 2025 14:13:04 +1100 Subject: [PATCH 1/5] infra: Update to v3 --- .github/workflows/build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4727fd25..5c81218e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,11 +32,12 @@ jobs: max-parallel: 3 matrix: file: ${{ fromJson(needs.pre-ci.outputs.matrix) }} - uses: access-nri/build-ci/.github/workflows/ci.yml@v2 + uses: access-nri/build-ci/.github/workflows/ci.yml@v3 with: spack-manifest-path: ${{ matrix.file }} spack-manifest-data-path: .github/build-ci/data/standard.json allow-ssh-into-spack-install: false # If true, PR author must ssh into instance to complete job - # spack-packages-ref: main + # builtin-spack-packages-ref: main + # access-spack-packages-ref: api-v2 # spack-config-ref: main - # spack-ref: releases/v0.22 + # spack-ref: releases/v1.0 From 2e0da29ec913b85b5fa5c14b338e9cf5c6f3014b Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 5 Dec 2025 09:08:21 +1100 Subject: [PATCH 2/5] [no-ci] infra: Update to spack v1.1 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5c81218e..53f1302b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,4 +40,4 @@ jobs: # builtin-spack-packages-ref: main # access-spack-packages-ref: api-v2 # spack-config-ref: main - # spack-ref: releases/v1.0 + # spack-ref: releases/v1.1 From 36ade4b6ce2beeaafee91a53e68d2d8173c62ac7 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Tue, 17 Feb 2026 16:25:50 +1100 Subject: [PATCH 3/5] Update comments --- .github/workflows/build.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 53f1302b..fb18920b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,5 @@ jobs: spack-manifest-path: ${{ matrix.file }} spack-manifest-data-path: .github/build-ci/data/standard.json allow-ssh-into-spack-install: false # If true, PR author must ssh into instance to complete job - # builtin-spack-packages-ref: main - # access-spack-packages-ref: api-v2 - # spack-config-ref: main - # spack-ref: releases/v1.1 + # Default args (including explicit spack/spack-packages/spack-config versions) + # are specified in https://github.com/ACCESS-NRI/build-ci/tree/v3/.github/workflows#inputs From 554f04ee277ea1f37f175eab9b9cb122ed0f1a49 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Fri, 27 Feb 2026 15:12:54 +1100 Subject: [PATCH 4/5] Update all manifests to spack v1.1-style, using toolchains --- .github/build-ci/data/standard.json | 6 +++--- .../manifests/gcc-no-use_access_fms.spack.yaml.j2 | 6 +++++- .../build-ci/manifests/gcc-use_access_fms.spack.yaml.j2 | 6 +++++- .../manifests/intel-no-use_access_fms.spack.yaml.j2 | 6 +++++- .../build-ci/manifests/intel-use_access_fms.spack.yaml.j2 | 6 +++++- .../manifests/oneapi-no-use_access_fms.spack.yaml.j2 | 8 ++++++-- .../manifests/oneapi-use_access_fms.spack.yaml.j2 | 8 ++++++-- 7 files changed, 35 insertions(+), 11 deletions(-) diff --git a/.github/build-ci/data/standard.json b/.github/build-ci/data/standard.json index 0d0bb971..c619d1d9 100644 --- a/.github/build-ci/data/standard.json +++ b/.github/build-ci/data/standard.json @@ -1,5 +1,5 @@ { - "intel_compiler": "intel@2021.10.0", - "gcc_compiler": "gcc@13.2.0", - "oneapi_compiler": "oneapi@2025.2.0" + "intel_compiler_version": "2021.10.0", + "gcc_compiler_version": "13.2.0", + "oneapi_compiler_version": "2025.2.0" } \ No newline at end of file diff --git a/.github/build-ci/manifests/gcc-no-use_access_fms.spack.yaml.j2 b/.github/build-ci/manifests/gcc-no-use_access_fms.spack.yaml.j2 index 5e1c6b16..c875e80c 100644 --- a/.github/build-ci/manifests/gcc-no-use_access_fms.spack.yaml.j2 +++ b/.github/build-ci/manifests/gcc-no-use_access_fms.spack.yaml.j2 @@ -6,9 +6,13 @@ spack: fms: require: - '@git.2025.02=2025.02 ~openmp precision=64' + gcc: + require: + - '@{{ gcc_compiler_version }}' all: require: - - '%{{ gcc_compiler }} target=x86_64' + - '%access_gcc' + - target=x86_64 concretizer: unify: false view: false diff --git a/.github/build-ci/manifests/gcc-use_access_fms.spack.yaml.j2 b/.github/build-ci/manifests/gcc-use_access_fms.spack.yaml.j2 index f0a06c43..3e7970dd 100644 --- a/.github/build-ci/manifests/gcc-use_access_fms.spack.yaml.j2 +++ b/.github/build-ci/manifests/gcc-use_access_fms.spack.yaml.j2 @@ -3,9 +3,13 @@ spack: # *_compiler is defined in the .github/build-ci/data/standard.json file - access-generic-tracers@git.{{ ref }} +use_access_fms packages: + gcc: + require: + - '@{{ gcc_compiler_version }}' all: require: - - '%{{ gcc_compiler }} target=x86_64' + - '%access_gcc' + - target=x86_64 concretizer: unify: false view: false diff --git a/.github/build-ci/manifests/intel-no-use_access_fms.spack.yaml.j2 b/.github/build-ci/manifests/intel-no-use_access_fms.spack.yaml.j2 index 02eab2af..7f668df0 100644 --- a/.github/build-ci/manifests/intel-no-use_access_fms.spack.yaml.j2 +++ b/.github/build-ci/manifests/intel-no-use_access_fms.spack.yaml.j2 @@ -6,9 +6,13 @@ spack: fms: require: - '@git.2025.02=2025.02 ~openmp precision=64' + intel-oneapi-compilers-classic: + require: + - '@{{ intel_compiler_version }}' all: require: - - '%{{ intel_compiler }} target=x86_64' + - '%access_intel' + - target=x86_64 concretizer: unify: false view: false diff --git a/.github/build-ci/manifests/intel-use_access_fms.spack.yaml.j2 b/.github/build-ci/manifests/intel-use_access_fms.spack.yaml.j2 index 8938a52f..57ac4782 100644 --- a/.github/build-ci/manifests/intel-use_access_fms.spack.yaml.j2 +++ b/.github/build-ci/manifests/intel-use_access_fms.spack.yaml.j2 @@ -3,9 +3,13 @@ spack: # *_compiler is defined in the .github/build-ci/data/standard.json file - access-generic-tracers@git.{{ ref }} +use_access_fms packages: + intel-oneapi-compilers-classic: + require: + - '@{{ intel_compiler_version }}' all: require: - - '%{{ intel_compiler }} target=x86_64' + - '%access_intel' + - target=x86_64 concretizer: unify: false view: false diff --git a/.github/build-ci/manifests/oneapi-no-use_access_fms.spack.yaml.j2 b/.github/build-ci/manifests/oneapi-no-use_access_fms.spack.yaml.j2 index 06269d8e..ab719013 100644 --- a/.github/build-ci/manifests/oneapi-no-use_access_fms.spack.yaml.j2 +++ b/.github/build-ci/manifests/oneapi-no-use_access_fms.spack.yaml.j2 @@ -8,10 +8,14 @@ spack: - '@git.2025.02=2025.02 ~openmp precision=64' gcc-runtime: require: - - '%gcc' + - '%access_gcc' + intel-oneapi-compilers: + require: + - '@{{ oneapi_compiler_version }}' all: require: - - '%{{ oneapi_compiler }} target=x86_64' + - '%access_oneapi' + - target=x86_64 concretizer: unify: false view: false diff --git a/.github/build-ci/manifests/oneapi-use_access_fms.spack.yaml.j2 b/.github/build-ci/manifests/oneapi-use_access_fms.spack.yaml.j2 index c1c0934d..085dd441 100644 --- a/.github/build-ci/manifests/oneapi-use_access_fms.spack.yaml.j2 +++ b/.github/build-ci/manifests/oneapi-use_access_fms.spack.yaml.j2 @@ -5,10 +5,14 @@ spack: packages: gcc-runtime: require: - - '%gcc' + - '%access_gcc' + intel-oneapi-compilers: + require: + - '@{{ oneapi_compiler_version }}' all: require: - - '%{{ oneapi_compiler }} target=x86_64' + - '%access_oneapi' + - target=x86_64 concretizer: unify: false view: false From 844ec2e9a0c371aef8ddf40e3863e10861c1201a Mon Sep 17 00:00:00 2001 From: dougiesquire Date: Thu, 5 Mar 2026 10:47:58 +1100 Subject: [PATCH 5/5] Update manifests to use FMS 2025.03 --- .github/build-ci/data/standard.json | 5 +++-- .../build-ci/manifests/gcc-no-use_access_fms.spack.yaml.j2 | 2 +- .../build-ci/manifests/intel-no-use_access_fms.spack.yaml.j2 | 2 +- .../manifests/oneapi-no-use_access_fms.spack.yaml.j2 | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/build-ci/data/standard.json b/.github/build-ci/data/standard.json index c619d1d9..3a6c93b6 100644 --- a/.github/build-ci/data/standard.json +++ b/.github/build-ci/data/standard.json @@ -1,5 +1,6 @@ { "intel_compiler_version": "2021.10.0", "gcc_compiler_version": "13.2.0", - "oneapi_compiler_version": "2025.2.0" -} \ No newline at end of file + "oneapi_compiler_version": "2025.2.0", + "fms_version": "2025.03" +} diff --git a/.github/build-ci/manifests/gcc-no-use_access_fms.spack.yaml.j2 b/.github/build-ci/manifests/gcc-no-use_access_fms.spack.yaml.j2 index c875e80c..25339226 100644 --- a/.github/build-ci/manifests/gcc-no-use_access_fms.spack.yaml.j2 +++ b/.github/build-ci/manifests/gcc-no-use_access_fms.spack.yaml.j2 @@ -5,7 +5,7 @@ spack: packages: fms: require: - - '@git.2025.02=2025.02 ~openmp precision=64' + - '@{{ fms_version }} ~openmp precision=64' gcc: require: - '@{{ gcc_compiler_version }}' diff --git a/.github/build-ci/manifests/intel-no-use_access_fms.spack.yaml.j2 b/.github/build-ci/manifests/intel-no-use_access_fms.spack.yaml.j2 index 7f668df0..d9b25ae6 100644 --- a/.github/build-ci/manifests/intel-no-use_access_fms.spack.yaml.j2 +++ b/.github/build-ci/manifests/intel-no-use_access_fms.spack.yaml.j2 @@ -5,7 +5,7 @@ spack: packages: fms: require: - - '@git.2025.02=2025.02 ~openmp precision=64' + - '@{{ fms_version }} ~openmp precision=64' intel-oneapi-compilers-classic: require: - '@{{ intel_compiler_version }}' diff --git a/.github/build-ci/manifests/oneapi-no-use_access_fms.spack.yaml.j2 b/.github/build-ci/manifests/oneapi-no-use_access_fms.spack.yaml.j2 index ab719013..b0d0742d 100644 --- a/.github/build-ci/manifests/oneapi-no-use_access_fms.spack.yaml.j2 +++ b/.github/build-ci/manifests/oneapi-no-use_access_fms.spack.yaml.j2 @@ -5,7 +5,7 @@ spack: packages: fms: require: - - '@git.2025.02=2025.02 ~openmp precision=64' + - '@{{ fms_version }} ~openmp precision=64' gcc-runtime: require: - '%access_gcc'