Skip to content

Commit e3123f6

Browse files
committed
Update literally all the manifests to use toolchains
1 parent f6f46c0 commit e3123f6

22 files changed

Lines changed: 108 additions & 24 deletions

.github/build-ci/data/standard.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"intel_compiler": "intel@2021.10.0",
3-
"gcc_compiler": "gcc@13.2.0",
4-
"oneapi_compiler": "oneapi@2025.2.0",
2+
"intel_compiler_version": "2021.10.0",
3+
"gcc_compiler_version": "13.2.0",
4+
"oneapi_compiler_version": "2025.2.0",
55
"cice5_version": "2026.01.000",
66
"um_version": "git.2026.02.000=access-esm1.6",
77
"cable_version": "2025.11.000",

.github/build-ci/manifests/pr/gcc_access-esm1.6.spack.yaml.j2

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,13 @@ spack:
4040
openmpi:
4141
require:
4242
- '@{{ openmpi_version }}'
43+
gcc:
44+
require:
45+
- '@{{ gcc_compiler_version }}'
4346
all:
4447
require:
45-
- '%{{ gcc_compiler }} target=x86_64'
48+
- '%access_gcc'
49+
- 'target=x86_64'
4650
concretizer:
4751
unify: false
4852
view: false

.github/build-ci/manifests/pr/gcc_access-om2.spack.yaml.j2

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,13 @@ spack:
3737
openmpi:
3838
require:
3939
- '@{{ openmpi_version }}'
40+
gcc:
41+
require:
42+
- '@{{ gcc_compiler_version }}'
4043
all:
4144
require:
42-
- '%{{ gcc_compiler }} target=x86_64'
45+
- '%access_gcc'
46+
- 'target=x86_64'
4347
concretizer:
4448
unify: false
4549
view: false

.github/build-ci/manifests/pr/intel_access-esm1.6.spack.yaml.j2

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,13 @@ spack:
4040
openmpi:
4141
require:
4242
- '@{{ openmpi_version }}'
43+
intel-oneapi-compilers-classic:
44+
require:
45+
- '@{{ intel_compiler_version }}'
4346
all:
4447
require:
45-
- '%{{ intel_compiler }} target=x86_64'
48+
- '%access_intel'
49+
- 'target=x86_64'
4650
concretizer:
4751
unify: false
4852
view: false

.github/build-ci/manifests/pr/intel_access-om2.spack.yaml.j2

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,13 @@ spack:
3737
openmpi:
3838
require:
3939
- '@{{ openmpi_version }}'
40+
intel-oneapi-compilers-classic:
41+
require:
42+
- '@{{ intel_compiler_version }}'
4043
all:
4144
require:
42-
- '%{{ intel_compiler }} target=x86_64'
45+
- '%access_intel'
46+
- 'target=x86_64'
4347
concretizer:
4448
unify: false
4549
view: false

.github/build-ci/manifests/pr/oneapi_access-esm1.6.spack.yaml.j2

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,13 @@ spack:
4343
gcc-runtime:
4444
require:
4545
- '%gcc'
46+
intel-oneapi-compilers:
47+
require:
48+
- '@{{ oneapi_compiler_version }}'
4649
all:
4750
require:
48-
- '%{{ oneapi_compiler }} target=x86_64'
51+
- '%access_oneapi'
52+
- 'target=x86_64'
4953
concretizer:
5054
unify: false
5155
view: false

.github/build-ci/manifests/pr/oneapi_access-om2.spack.yaml.j2

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,13 @@ spack:
4040
gcc-runtime:
4141
require:
4242
- '%gcc'
43+
intel-oneapi-compilers:
44+
require:
45+
- '@{{ oneapi_compiler_version }}'
4346
all:
4447
require:
45-
- '%{{ oneapi_compiler }} target=x86_64'
48+
- '%access_oneapi'
49+
- 'target=x86_64'
4650
concretizer:
4751
unify: false
4852
view: false

.github/build-ci/manifests/scheduled/gcc_mom-sis.spack.yaml.j2

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,13 @@ spack:
1111
openmpi:
1212
require:
1313
- '@{{ openmpi_version }}'
14+
gcc:
15+
require:
16+
- '@{{ gcc_compiler_version }}'
1417
all:
1518
require:
16-
- '%{{ gcc_compiler }} target=x86_64'
19+
- '%access_gcc'
20+
- 'target=x86_64'
1721
concretizer:
1822
unify: false
1923
view: false

.github/build-ci/manifests/scheduled/gcc_mom-solo.spack.yaml.j2

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,13 @@ spack:
1111
openmpi:
1212
require:
1313
- '@{{ openmpi_version }}'
14+
gcc:
15+
require:
16+
- '@{{ gcc_compiler_version }}'
1417
all:
1518
require:
16-
- '%{{ gcc_compiler }} target=x86_64'
19+
- '%access_gcc'
20+
- 'target=x86_64'
1721
concretizer:
1822
unify: false
1923
view: false

.github/build-ci/manifests/scheduled/gcc_mom_access-esm1.6.spack.yaml.j2

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,13 @@ spack:
2323
openmpi:
2424
require:
2525
- '@{{ openmpi_version }}'
26+
gcc:
27+
require:
28+
- '@{{ gcc_compiler_version }}'
2629
all:
2730
require:
28-
- '%{{ gcc_compiler }} target=x86_64'
31+
- '%access_gcc'
32+
- 'target=x86_64'
2933
concretizer:
3034
unify: false
3135
view: false

0 commit comments

Comments
 (0)