Skip to content

Commit 138bcb1

Browse files
dougiesquiredougiesquire
authored
Build-CI: Update component versions; Add gcc builds (#75)
1 parent 627a321 commit 138bcb1

8 files changed

Lines changed: 131 additions & 21 deletions

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
"intel_compiler": "intel@2021.10.0",
33
"gcc_compiler": "gcc@13.2.0",
44
"oneapi_compiler": "oneapi@2025.2.0",
5-
"cice5_version_om2": "git.2025.03.001=access-om2",
6-
"cice5_version_esm1p6": "git.access-esm1.6-2025.07.001=access-esm1.6",
7-
"um_version_esm1p6": "git.access-esm1.6-2025.06.000=access-esm1.6",
8-
"gcom4_version": "git.2024.05.28=access-esm1.5",
5+
"cice5_version": "2026.01.000",
6+
"um_version": "git.2026.02.000=access-esm1.6",
7+
"cable_version": "2025.11.000",
8+
"gcom4_version": "git.2025.08.000=access-esm1.5",
99
"libaccessom2_version": "git.2025.05.001=access-om2",
10-
"oasis3_mct_version_om2": "git.2025.03.001=access-om2",
11-
"oasis3_mct_version_esm1p6": "git.access-esm1.5-2025.03.001=access-esm1.5",
10+
"oasis3_mct_version_esm1p6": "5.2",
11+
"oasis3_mct_version_om2": "git.2025.03.001=stable",
1212
"netcdf_c_version": "4.9.2",
1313
"netcdf_fortran_version": "4.6.1",
14-
"parallelio_version": "2.6.2",
15-
"openmpi_version": "5.0.5",
16-
"access_fms_version": "git.mom5-2025.05.000=mom5",
17-
"access_generic_tracers_version": "2025.07.002",
14+
"parallelio_version": "2.6.8",
15+
"openmpi_version": "5.0.8",
16+
"access_fms_version": "git.mom5-2025.08.000=mom5",
17+
"access_generic_tracers_version": "2026.01.000",
1818
"access_mocsy_version": "2025.07.002"
1919
}

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

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
spack:
2+
specs:
3+
- 'access-esm1p6@latest cice=5'
4+
packages:
5+
mom5:
6+
require:
7+
- '@git.{{ ref }}=access-esm1.6'
8+
cice5:
9+
require:
10+
- '@{{ cice5_version }}'
11+
- 'nxglob=360 nyglob=300 blckx=30 blcky=300 mxblcks=1' # grid size and block size
12+
um7:
13+
require:
14+
- '@{{ um_version }}'
15+
cable:
16+
require:
17+
- '@{{ cable_version }}'
18+
- library=access-esm1.6
19+
gcom4:
20+
require:
21+
- '@{{ gcom4_version }}'
22+
oasis3-mct:
23+
require:
24+
- '@{{ oasis3_mct_version_esm1p6 }}'
25+
access-fms:
26+
require:
27+
- '@{{ access_fms_version }}'
28+
access-generic-tracers:
29+
require:
30+
- '@{{ access_generic_tracers_version }}'
31+
access-mocsy:
32+
require:
33+
- '@{{ access_mocsy_version }}'
34+
netcdf-c:
35+
require:
36+
- '@{{ netcdf_c_version}}'
37+
netcdf-fortran:
38+
require:
39+
- '@{{ netcdf_fortran_version }}'
40+
openmpi:
41+
require:
42+
- '@{{ openmpi_version }}'
43+
all:
44+
require:
45+
- '%{{ gcc_compiler }} target=x86_64'
46+
concretizer:
47+
unify: false
48+
view: false

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

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
spack:
2+
specs:
3+
- 'access-om2@latest'
4+
packages:
5+
mom5:
6+
require:
7+
- '@git.{{ ref }}=access-om2'
8+
cice5:
9+
require:
10+
- '@{{ cice5_version }}'
11+
- 'io_type=PIO build_system=cmake'
12+
- 'nxglob=360 nyglob=300 blckx=15 blcky=300 mxblcks=1' # grid size and block size
13+
libaccessom2:
14+
require:
15+
- '@{{ libaccessom2_version }}'
16+
oasis3-mct:
17+
require:
18+
- '@{{ oasis3_mct_version_om2 }}'
19+
access-fms:
20+
require:
21+
- '@{{ access_fms_version }}'
22+
access-generic-tracers:
23+
require:
24+
- '@{{ access_generic_tracers_version }}'
25+
access-mocsy:
26+
require:
27+
- '@{{ access_mocsy_version }}'
28+
netcdf-c:
29+
require:
30+
- '@{{ netcdf_c_version}}'
31+
netcdf-fortran:
32+
require:
33+
- '@{{ netcdf_fortran_version }}'
34+
parallelio:
35+
require:
36+
- '@{{ parallelio_version }}'
37+
openmpi:
38+
require:
39+
- '@{{ openmpi_version }}'
40+
all:
41+
require:
42+
- '%{{ gcc_compiler }} target=x86_64'
43+
concretizer:
44+
unify: false
45+
view: false

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,15 @@ spack:
77
- '@git.{{ ref }}=access-esm1.6'
88
cice5:
99
require:
10-
- '@{{ cice5_version_esm1p6 }}'
10+
- '@{{ cice5_version }}'
11+
- 'nxglob=360 nyglob=300 blckx=30 blcky=300 mxblcks=1' # grid size and block size
1112
um7:
1213
require:
13-
- '@{{ um_version_esm1p6 }}'
14+
- '@{{ um_version }}'
15+
cable:
16+
require:
17+
- '@{{ cable_version }}'
18+
- library=access-esm1.6
1419
gcom4:
1520
require:
1621
- '@{{ gcom4_version }}'

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ spack:
77
- '@git.{{ ref }}=access-om2'
88
cice5:
99
require:
10-
- '@{{ cice5_version_om2 }}'
10+
- '@{{ cice5_version }}'
11+
- 'io_type=PIO build_system=cmake'
12+
- 'nxglob=360 nyglob=300 blckx=15 blcky=300 mxblcks=1' # grid size and block size
1113
libaccessom2:
1214
require:
1315
- '@{{ libaccessom2_version }}'
@@ -35,12 +37,9 @@ spack:
3537
openmpi:
3638
require:
3739
- '@{{ openmpi_version }}'
38-
gcc-runtime:
39-
require:
40-
- '%gcc'
4140
all:
4241
require:
43-
- '%{{ oneapi_compiler }} target=x86_64'
42+
- '%{{ intel_compiler }} target=x86_64'
4443
concretizer:
4544
unify: false
4645
view: false

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,15 @@ spack:
77
- '@git.{{ ref }}=access-esm1.6'
88
cice5:
99
require:
10-
- '@{{ cice5_version_esm1p6 }}'
10+
- '@{{ cice5_version }}'
11+
- 'nxglob=360 nyglob=300 blckx=30 blcky=300 mxblcks=1' # grid size and block size
1112
um7:
1213
require:
13-
- '@{{ um_version_esm1p6 }}'
14+
- '@{{ um_version }}'
15+
cable:
16+
require:
17+
- '@{{ cable_version }}'
18+
- library=access-esm1.6
1419
gcom4:
1520
require:
1621
- '@{{ gcom4_version }}'
@@ -35,9 +40,12 @@ spack:
3540
openmpi:
3641
require:
3742
- '@{{ openmpi_version }}'
43+
gcc-runtime:
44+
require:
45+
- '%gcc'
3846
all:
3947
require:
40-
- '%{{ intel_compiler }} target=x86_64'
48+
- '%{{ oneapi_compiler }} target=x86_64'
4149
concretizer:
4250
unify: false
4351
view: false

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ spack:
77
- '@git.{{ ref }}=access-om2'
88
cice5:
99
require:
10-
- '@{{ cice5_version_om2 }}'
10+
- '@{{ cice5_version }}'
11+
- 'io_type=PIO build_system=cmake'
12+
- 'nxglob=360 nyglob=300 blckx=15 blcky=300 mxblcks=1' # grid size and block size
1113
libaccessom2:
1214
require:
1315
- '@{{ libaccessom2_version }}'

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ jobs:
2929
max-parallel: 4
3030
matrix:
3131
file: ${{ fromJson(needs.pre-ci.outputs.matrix) }}
32+
exclude:
33+
# TODO: Remove this exclusion once https://github.com/ACCESS-NRI/GCOM4/issues/15 is fixed
34+
- file: .github/build-ci/manifests/pr/gcc_access-esm1.6.spack.yaml.j2
3235
uses: access-nri/build-ci/.github/workflows/ci.yml@v2
3336
with:
3437
spack-manifest-path: ${{ matrix.file }}

0 commit comments

Comments
 (0)