Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/build-ci/data/standard.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"gcc_compiler": "gcc@13.2.0",
"intel_compiler": "intel@2021.10.0",
"oneapi_compiler": "oneapi@2025.2.0",
"gcc_compiler_version": "13.2.0",
"intel_compiler_version": "2021.10.0",
"oneapi_compiler_version": "2025.2.0",
"target": "x86_64"
}
6 changes: 5 additions & 1 deletion .github/build-ci/manifests/gcc-no-access3.spack.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@ spack:
specs:
- access-cice @git.{{ ref }} ~access3 io_type=PIO
packages:
gcc:
require:
- '@{{ gcc_compiler_version }}'
all:
require:
- '%{{ gcc_compiler }} target={{ target}}'
- '%access_gcc'
- target={{ target }}
concretizer:
unify: false
view: false
11 changes: 10 additions & 1 deletion .github/build-ci/manifests/intel-access3.spack.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,18 @@ spack:
specs:
- access-cice @git.{{ ref }} +access3 io_type=PIO
packages:
# We pin a version of python as spack v1.1 has trouble building the default latest
# python@3.14.3%intel@2021.10.0 due to a segfault.
python:
require:
- '@3.11.14'
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe a comment here on why we pinned the version

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in b9de7e7

intel-oneapi-compilers-classic:
require:
- '@{{ intel_compiler_version }}'
all:
require:
- '%{{ intel_compiler }} target={{ target }}'
- '%access_intel'
- target={{ target }}
concretizer:
unify: false
view: false
6 changes: 5 additions & 1 deletion .github/build-ci/manifests/intel-no-access3.spack.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@ spack:
- access-cice @git.{{ ref }} ~access3 io_type=NetCDF
- access-cice @git.{{ ref }} ~access3 io_type=Binary
packages:
intel-oneapi-compilers-classic:
require:
- '@{{ intel_compiler_version }}'
all:
require:
- '%{{ intel_compiler }} target={{ target }}'
- '%access_intel'
- target={{ target }}
concretizer:
unify: false
view: false
9 changes: 7 additions & 2 deletions .github/build-ci/manifests/oneapi-access3.spack.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,15 @@ spack:
packages:
gcc-runtime:
require:
- '%gcc target={{ target }}'
- '%access_gcc'
- target={{ target }}
intel-oneapi-compilers:
require:
- '@{{ oneapi_compiler_version }}'
all:
require:
- '%{{ oneapi_compiler }} target={{ target }}'
- '%access_oneapi'
- target={{ target }}
concretizer:
unify: false
view: false
9 changes: 7 additions & 2 deletions .github/build-ci/manifests/oneapi-no-access3.spack.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,15 @@ spack:
packages:
gcc-runtime:
require:
- '%gcc target={{ target }}'
- '%access_gcc'
- target={{ target }}
intel-oneapi-compilers:
require:
- '@{{ oneapi_compiler_version }}'
all:
require:
- '%{{ oneapi_compiler }} target={{ target }}'
- '%access_oneapi'
- target={{ target }}
concretizer:
unify: false
view: false
7 changes: 3 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,10 @@ jobs:
max-parallel: 5
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 }}
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