diff --git a/.github/build-ci/data/standard.json b/.github/build-ci/data/standard.json index 43201a31a..eda44466e 100644 --- a/.github/build-ci/data/standard.json +++ b/.github/build-ci/data/standard.json @@ -1,12 +1,12 @@ { - "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", "cice5_version": "2026.01.000", "um_version": "git.2026.02.000=access-esm1.6", "cable_version": "2025.11.000", "gcom4_version": "git.2025.08.000=access-esm1.5", - "libaccessom2_version": "git.2025.05.001=access-om2", + "libaccessom2_version": "git.2026.02.000=access-om2", "oasis3_mct_version_esm1p6": "5.2", "oasis3_mct_version_om2": "git.2025.03.001=stable", "netcdf_c_version": "4.9.2", @@ -14,6 +14,6 @@ "parallelio_version": "2.6.8", "openmpi_version": "5.0.8", "access_fms_version": "git.mom5-2025.08.000=mom5", - "access_generic_tracers_version": "2026.01.000", + "access_generic_tracers_version": "2026.02.000", "access_mocsy_version": "2025.07.002" } diff --git a/.github/build-ci/manifests/pr/gcc_access-esm1.6.spack.yaml.j2 b/.github/build-ci/manifests/pr/gcc_access-esm1.6.spack.yaml.j2 index 83ef2d43e..88bb8bfcd 100644 --- a/.github/build-ci/manifests/pr/gcc_access-esm1.6.spack.yaml.j2 +++ b/.github/build-ci/manifests/pr/gcc_access-esm1.6.spack.yaml.j2 @@ -40,9 +40,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' + 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/pr/gcc_access-om2.spack.yaml.j2 b/.github/build-ci/manifests/pr/gcc_access-om2.spack.yaml.j2 index 50a3d8b7f..ef073eef7 100644 --- a/.github/build-ci/manifests/pr/gcc_access-om2.spack.yaml.j2 +++ b/.github/build-ci/manifests/pr/gcc_access-om2.spack.yaml.j2 @@ -9,7 +9,6 @@ spack: require: - '@{{ cice5_version }}' - 'io_type=PIO build_system=cmake' - - 'nxglob=360 nyglob=300 blckx=15 blcky=300 mxblcks=1' # grid size and block size libaccessom2: require: - '@{{ libaccessom2_version }}' @@ -37,9 +36,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' + 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/pr/intel_access-esm1.6.spack.yaml.j2 b/.github/build-ci/manifests/pr/intel_access-esm1.6.spack.yaml.j2 index a83ed2736..f3c3749cd 100644 --- a/.github/build-ci/manifests/pr/intel_access-esm1.6.spack.yaml.j2 +++ b/.github/build-ci/manifests/pr/intel_access-esm1.6.spack.yaml.j2 @@ -40,9 +40,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' + 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/pr/intel_access-om2.spack.yaml.j2 b/.github/build-ci/manifests/pr/intel_access-om2.spack.yaml.j2 index 1fc02ce82..a4c9bec45 100644 --- a/.github/build-ci/manifests/pr/intel_access-om2.spack.yaml.j2 +++ b/.github/build-ci/manifests/pr/intel_access-om2.spack.yaml.j2 @@ -9,7 +9,6 @@ spack: require: - '@{{ cice5_version }}' - 'io_type=PIO build_system=cmake' - - 'nxglob=360 nyglob=300 blckx=15 blcky=300 mxblcks=1' # grid size and block size libaccessom2: require: - '@{{ libaccessom2_version }}' @@ -37,9 +36,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' + 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/pr/oneapi_access-esm1.6.spack.yaml.j2 b/.github/build-ci/manifests/pr/oneapi_access-esm1.6.spack.yaml.j2 index b483055b3..51d94d32b 100644 --- a/.github/build-ci/manifests/pr/oneapi_access-esm1.6.spack.yaml.j2 +++ b/.github/build-ci/manifests/pr/oneapi_access-esm1.6.spack.yaml.j2 @@ -40,12 +40,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' - gcc-runtime: + intel-oneapi-compilers: require: - - '%gcc' + - '@{{ 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/pr/oneapi_access-om2.spack.yaml.j2 b/.github/build-ci/manifests/pr/oneapi_access-om2.spack.yaml.j2 index 7c5f885e5..07ca3004f 100644 --- a/.github/build-ci/manifests/pr/oneapi_access-om2.spack.yaml.j2 +++ b/.github/build-ci/manifests/pr/oneapi_access-om2.spack.yaml.j2 @@ -9,7 +9,6 @@ spack: require: - '@{{ cice5_version }}' - 'io_type=PIO build_system=cmake' - - 'nxglob=360 nyglob=300 blckx=15 blcky=300 mxblcks=1' # grid size and block size libaccessom2: require: - '@{{ libaccessom2_version }}' @@ -37,12 +36,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' - gcc-runtime: + intel-oneapi-compilers: require: - - '%gcc' + - '@{{ 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/scheduled/gcc_mom-sis.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/gcc_mom-sis.spack.yaml.j2 index 792d3f8c2..985e96092 100644 --- a/.github/build-ci/manifests/scheduled/gcc_mom-sis.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/gcc_mom-sis.spack.yaml.j2 @@ -11,9 +11,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' + 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/scheduled/gcc_mom-solo.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/gcc_mom-solo.spack.yaml.j2 index 56185a6d2..fac094a16 100644 --- a/.github/build-ci/manifests/scheduled/gcc_mom-solo.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/gcc_mom-solo.spack.yaml.j2 @@ -11,9 +11,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' + 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/scheduled/gcc_mom_access-esm1.6.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/gcc_mom_access-esm1.6.spack.yaml.j2 index e7ee1aab8..2f977d2e4 100644 --- a/.github/build-ci/manifests/scheduled/gcc_mom_access-esm1.6.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/gcc_mom_access-esm1.6.spack.yaml.j2 @@ -23,9 +23,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' + 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/scheduled/gcc_mom_access-om2.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/gcc_mom_access-om2.spack.yaml.j2 index f993f4644..12c029e1c 100644 --- a/.github/build-ci/manifests/scheduled/gcc_mom_access-om2.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/gcc_mom_access-om2.spack.yaml.j2 @@ -28,9 +28,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' + 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/scheduled/gcc_mom_legacy-access-om2-bgc.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/gcc_mom_legacy-access-om2-bgc.spack.yaml.j2 index 2daab1954..bf58687a4 100644 --- a/.github/build-ci/manifests/scheduled/gcc_mom_legacy-access-om2-bgc.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/gcc_mom_legacy-access-om2-bgc.spack.yaml.j2 @@ -28,9 +28,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' + 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/scheduled/intel_mom-sis.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/intel_mom-sis.spack.yaml.j2 index 6bd83ac27..744bf8f28 100644 --- a/.github/build-ci/manifests/scheduled/intel_mom-sis.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/intel_mom-sis.spack.yaml.j2 @@ -11,9 +11,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' + 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/scheduled/intel_mom-solo.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/intel_mom-solo.spack.yaml.j2 index 06d72b789..1fb6b96fa 100644 --- a/.github/build-ci/manifests/scheduled/intel_mom-solo.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/intel_mom-solo.spack.yaml.j2 @@ -11,9 +11,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' + 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/scheduled/intel_mom_access-esm1.6.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/intel_mom_access-esm1.6.spack.yaml.j2 index 041db49bb..9e0edcf5e 100644 --- a/.github/build-ci/manifests/scheduled/intel_mom_access-esm1.6.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/intel_mom_access-esm1.6.spack.yaml.j2 @@ -23,9 +23,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' + 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/scheduled/intel_mom_access-om2.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/intel_mom_access-om2.spack.yaml.j2 index 1cba66d1b..926df2073 100644 --- a/.github/build-ci/manifests/scheduled/intel_mom_access-om2.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/intel_mom_access-om2.spack.yaml.j2 @@ -28,9 +28,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' + 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/scheduled/intel_mom_legacy-access-om2-bgc.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/intel_mom_legacy-access-om2-bgc.spack.yaml.j2 index ef55bd8f8..802fff120 100644 --- a/.github/build-ci/manifests/scheduled/intel_mom_legacy-access-om2-bgc.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/intel_mom_legacy-access-om2-bgc.spack.yaml.j2 @@ -28,9 +28,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' + 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/scheduled/oneapi_mom-sis.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/oneapi_mom-sis.spack.yaml.j2 index 483f09a0a..5599b1b36 100644 --- a/.github/build-ci/manifests/scheduled/oneapi_mom-sis.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/oneapi_mom-sis.spack.yaml.j2 @@ -11,12 +11,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' - gcc-runtime: + intel-oneapi-compilers-classic: require: - - '%gcc' + - '@{{ 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/scheduled/oneapi_mom-solo.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/oneapi_mom-solo.spack.yaml.j2 index 74f7e89e1..1cdd723d5 100644 --- a/.github/build-ci/manifests/scheduled/oneapi_mom-solo.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/oneapi_mom-solo.spack.yaml.j2 @@ -11,12 +11,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' - gcc-runtime: + intel-oneapi-compilers-classic: require: - - '%gcc' + - '@{{ 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/scheduled/oneapi_mom_access-esm1.6.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/oneapi_mom_access-esm1.6.spack.yaml.j2 index 7c6447667..55d048eac 100644 --- a/.github/build-ci/manifests/scheduled/oneapi_mom_access-esm1.6.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/oneapi_mom_access-esm1.6.spack.yaml.j2 @@ -23,12 +23,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' - gcc-runtime: + intel-oneapi-compilers-classic: require: - - '%gcc' + - '@{{ 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/scheduled/oneapi_mom_access-om2.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/oneapi_mom_access-om2.spack.yaml.j2 index a4c1b7d02..0504d20ac 100644 --- a/.github/build-ci/manifests/scheduled/oneapi_mom_access-om2.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/oneapi_mom_access-om2.spack.yaml.j2 @@ -28,12 +28,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' - gcc-runtime: + intel-oneapi-compilers-classic: require: - - '%gcc' + - '@{{ 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/scheduled/oneapi_mom_legacy-access-om2-bgc.spack.yaml.j2 b/.github/build-ci/manifests/scheduled/oneapi_mom_legacy-access-om2-bgc.spack.yaml.j2 index 554897b7c..df8d6a267 100644 --- a/.github/build-ci/manifests/scheduled/oneapi_mom_legacy-access-om2-bgc.spack.yaml.j2 +++ b/.github/build-ci/manifests/scheduled/oneapi_mom_legacy-access-om2-bgc.spack.yaml.j2 @@ -28,12 +28,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' - gcc-runtime: + intel-oneapi-compilers-classic: require: - - '%gcc' + - '@{{ oneapi_compiler_version }}' all: require: - - '%{{ oneapi_compiler }} target=x86_64' + - '%access_oneapi' + - 'target=x86_64' concretizer: unify: false view: false diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0030cacce..dffc67134 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,13 +32,12 @@ jobs: exclude: # TODO: Remove this exclusion once https://github.com/ACCESS-NRI/GCOM4/issues/15 is fixed - file: .github/build-ci/manifests/pr/gcc_access-esm1.6.spack.yaml.j2 - 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 - # spack-config-ref: main - # spack-ref: releases/v0.22 + # 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 secrets: spack-install-command-pat: ${{ secrets.SPACK_INSTALL_COMMAND_PAT }}