diff --git a/.github/build-ci/data/standard.json b/.github/build-ci/data/standard.json index 0a008113..3d80eb8e 100644 --- a/.github/build-ci/data/standard.json +++ b/.github/build-ci/data/standard.json @@ -1,20 +1,19 @@ { - "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", "target": "x86_64", - "mom5_version_om2": "git.2025.08.000=access-om2", - "mom5_version_esm1p6": "git.2025.08.000=access-esm1.6", - "cice5_version_om2": "git.2025.03.001=access-om2", - "cice5_version_esm1p6": "git.access-esm1.6-2025.07.001=access-esm1.6", - "um_version": "git.access-esm1.6-2025.06.000=access-esm1.6", + "mom5_version": "git.2026.02.000", + "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", "netcdf_c_version": "4.9.2", "netcdf_fortran_version": "4.6.1", - "parallelio_version": "2.6.2", - "openmpi_version": "5.0.5", - "access_fms_version": "git.mom5-2025.05.000=mom5", - "access_generic_tracers_version": "2025.07.002", + "parallelio_version": "2.6.8", + "openmpi_version": "5.0.8", + "access_fms_version": "git.mom5-2025.08.000=mom5", + "access_generic_tracers_version": "2026.02.000", "access_mocsy_version": "2025.07.002" } diff --git a/.github/build-ci/manifests/gcc-access-esm1p6.spack.yaml.j2 b/.github/build-ci/manifests/gcc-access-esm1p6.spack.yaml.j2 index 67f53dea..3dfd8ec1 100644 --- a/.github/build-ci/manifests/gcc-access-esm1p6.spack.yaml.j2 +++ b/.github/build-ci/manifests/gcc-access-esm1p6.spack.yaml.j2 @@ -7,13 +7,18 @@ spack: packages: mom5: require: - - '@{{ mom5_version_esm1p6 }}' + - '@{{ mom5_version }}=access-esm1.6' cice5: require: - - '@{{ cice5_version_esm1p6 }}' + - '@{{ cice5_version }}' + - 'nxglob=360 nyglob=300 blckx=30 blcky=300 mxblcks=1' # grid size and block size um7: require: - '@{{ um_version }}' + cable: + require: + - '@{{ cable_version }}' + - library=access-esm1.6 gcom4: require: - '@{{ gcom4_version }}' @@ -38,9 +43,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' + gcc: + require: + - '@{{ gcc_compiler_version }}' all: require: - - '%{{ gcc_compiler }} target={{ target }}' + - '%access_gcc' + - 'target={{ target }}' concretizer: unify: false view: false \ No newline at end of file diff --git a/.github/build-ci/manifests/gcc-access-om2.spack.yaml.j2 b/.github/build-ci/manifests/gcc-access-om2.spack.yaml.j2 index 3530baf3..faa46903 100644 --- a/.github/build-ci/manifests/gcc-access-om2.spack.yaml.j2 +++ b/.github/build-ci/manifests/gcc-access-om2.spack.yaml.j2 @@ -4,10 +4,11 @@ spack: packages: mom5: require: - - '@{{ mom5_version_om2 }}' + - '@{{ mom5_version }}=access-om2' cice5: require: - - '@{{ cice5_version_om2 }}' + - '@{{ cice5_version }}' + - 'io_type=PIO build_system=cmake' libaccessom2: require: - '@{{ libaccessom2_version }}' @@ -35,9 +36,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' + gcc: + require: + - '@{{ gcc_compiler_version }}' all: require: - - '%{{ gcc_compiler }} target={{ target }}' + - '%access_gcc' + - 'target={{ target }}' concretizer: unify: false view: false \ No newline at end of file diff --git a/.github/build-ci/manifests/intel-access-esm1p6.spack.yaml.j2 b/.github/build-ci/manifests/intel-access-esm1p6.spack.yaml.j2 index e2ee8728..38dd0f00 100644 --- a/.github/build-ci/manifests/intel-access-esm1p6.spack.yaml.j2 +++ b/.github/build-ci/manifests/intel-access-esm1p6.spack.yaml.j2 @@ -7,13 +7,17 @@ spack: packages: mom5: require: - - '@{{ mom5_version_esm1p6 }}' + - '@{{ mom5_version }}=access-esm1.6' cice5: require: - - '@{{ cice5_version_esm1p6 }}' + - '@{{ cice5_version }}' + - 'nxglob=360 nyglob=300 blckx=30 blcky=300 mxblcks=1' # grid size and block size um7: require: - '@{{ um_version }}' + cable: + require: + - '@{{ cable_version }}' gcom4: require: - '@{{ gcom4_version }}' @@ -38,9 +42,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' + intel-oneapi-compilers-classic: + require: + - '@{{ intel_compiler_version }}' all: require: - - '%{{ intel_compiler }} target={{ target }}' + - '%access_intel' + - 'target={{ target }}' concretizer: unify: false view: false \ No newline at end of file diff --git a/.github/build-ci/manifests/intel-access-om2.spack.yaml.j2 b/.github/build-ci/manifests/intel-access-om2.spack.yaml.j2 index 0a8543c8..51528200 100644 --- a/.github/build-ci/manifests/intel-access-om2.spack.yaml.j2 +++ b/.github/build-ci/manifests/intel-access-om2.spack.yaml.j2 @@ -4,10 +4,11 @@ spack: packages: mom5: require: - - '@{{ mom5_version_om2 }}' + - '@{{ mom5_version }}=access-om2' cice5: require: - - '@{{ cice5_version_om2 }}' + - '@{{ cice5_version }}' + - 'io_type=PIO build_system=cmake' libaccessom2: require: - '@{{ libaccessom2_version }}' @@ -35,9 +36,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' + intel-oneapi-compilers-classic: + require: + - '@{{ intel_compiler_version }}' all: require: - - '%{{ intel_compiler }} target={{ target }}' + - '%access_intel' + - 'target={{ target }}' concretizer: unify: false view: false \ No newline at end of file diff --git a/.github/build-ci/manifests/oneapi-access-esm1p6.spack.yaml.j2 b/.github/build-ci/manifests/oneapi-access-esm1p6.spack.yaml.j2 index 9af26f06..a40af1f6 100644 --- a/.github/build-ci/manifests/oneapi-access-esm1p6.spack.yaml.j2 +++ b/.github/build-ci/manifests/oneapi-access-esm1p6.spack.yaml.j2 @@ -7,13 +7,17 @@ spack: packages: mom5: require: - - '@{{ mom5_version_esm1p6 }}' + - '@{{ mom5_version }}=access-esm1.6' cice5: require: - - '@{{ cice5_version_esm1p6 }}' + - '@{{ cice5_version }}' + - 'nxglob=360 nyglob=300 blckx=30 blcky=300 mxblcks=1' # grid size and block size um7: require: - '@{{ um_version }}' + cable: + require: + - '@{{ cable_version }}' gcom4: require: - '@{{ gcom4_version }}' @@ -38,12 +42,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' - gcc-runtime: + intel-oneapi-compilers: require: - - '%gcc target={{ target }}' + - '@{{ oneapi_compiler_version }}' all: require: - - '%{{ oneapi_compiler }} target={{ target }}' + - '%access_oneapi' + - 'target={{ target }}' concretizer: unify: false view: false \ No newline at end of file diff --git a/.github/build-ci/manifests/oneapi-access-om2.spack.yaml.j2 b/.github/build-ci/manifests/oneapi-access-om2.spack.yaml.j2 index 631e04ff..4bc84780 100644 --- a/.github/build-ci/manifests/oneapi-access-om2.spack.yaml.j2 +++ b/.github/build-ci/manifests/oneapi-access-om2.spack.yaml.j2 @@ -4,10 +4,11 @@ spack: packages: mom5: require: - - '@{{ mom5_version_om2 }}' + - '@{{ mom5_version }}=access-om2' cice5: require: - - '@{{ cice5_version_om2 }}' + - '@{{ cice5_version }}' + - 'io_type=PIO build_system=cmake' libaccessom2: require: - '@{{ libaccessom2_version }}' @@ -35,12 +36,13 @@ spack: openmpi: require: - '@{{ openmpi_version }}' - gcc-runtime: + intel-oneapi-compilers: require: - - '%gcc target={{ target }}' + - '@{{ oneapi_compiler_version }}' all: require: - - '%{{ oneapi_compiler }} target={{ target }}' + - '%access_oneapi' + - 'target={{ target }}' concretizer: unify: false - view: false \ No newline at end of file + view: false diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f04268f5..52a5d776 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,13 +34,12 @@ jobs: exclude: # TODO: Remove this exclusion once https://github.com/ACCESS-NRI/GCOM4/issues/15 is fixed - file: .github/build-ci/manifests/gcc-access-esm1p6.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 }} allow-ssh-into-spack-install: false # If true, PR author must ssh into instance to complete job spack-manifest-data-path: .github/build-ci/data/standard.json - # 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 }}