Skip to content

Commit 5f0da2c

Browse files
CodeGatharshula
andauthored
[no ci] Infra Update v8: spack v1 Support (#58)
* Add Spack v1.1 support and use Oneapi compilers * Both ACCESS-ESM1.6 and ACCESS-OM2 have officially migrated to using the oneapi@2025.2.0 compiler. * [no ci] infra: Update to v8 * [no ci] Remove inputs.pr and inputs.root-sbd, updated versions in ci-comment * [no ci] Update config/versions.json access-spack-packages version to common api-v2 tag --------- Co-authored-by: Harshula Jayasuriya <harshula.jayasuriya@anu.edu.au>
1 parent 725a734 commit 5f0da2c

5 files changed

Lines changed: 15 additions & 16 deletions

File tree

.github/workflows/cd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
jobs:
1111
cd:
1212
name: CD
13-
uses: access-nri/build-cd/.github/workflows/cd.yml@spack-v1-migration_TEST
13+
uses: access-nri/build-cd/.github/workflows/cd.yml@v8
1414
with:
1515
model: ${{ vars.NAME }}
1616
spack-manifest-schema-version: 2-0-0

.github/workflows/ci-command.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
redeploy:
99
name: Redeploy
1010
if: startsWith(github.event.comment.body, '!redeploy') && github.event.issue.pull_request
11-
uses: access-nri/build-cd/.github/workflows/ci.yml@spack-v1-migration_TEST
11+
uses: access-nri/build-cd/.github/workflows/ci.yml@v8
1212
with:
1313
model: ${{ vars.NAME }}
1414
spack-manifest-schema-version: 2-0-0
@@ -22,7 +22,7 @@ jobs:
2222
bump:
2323
name: Bump
2424
if: startsWith(github.event.comment.body, '!bump') && github.event.issue.pull_request
25-
uses: access-nri/build-cd/.github/workflows/ci-comment.yml@spack-v1-migration_TEST
25+
uses: access-nri/build-cd/.github/workflows/ci-comment.yml@v8
2626
with:
2727
model: ${{ vars.NAME }}
2828
permissions:
@@ -32,7 +32,7 @@ jobs:
3232
configs:
3333
name: Configs
3434
if: startsWith(github.event.comment.body, '!update-configs') && github.event.issue.pull_request
35-
uses: access-nri/build-cd/.github/workflows/ci-command-configs.yml@spack-v1-migration_TEST
35+
uses: access-nri/build-cd/.github/workflows/ci-command-configs.yml@v8
3636
with:
3737
model: ${{ vars.NAME }}
3838
auto-configs-pr-schema-version: 1-0-0

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
pr-ci:
2121
name: CI
2222
if: github.event.action != 'closed'
23-
uses: access-nri/build-cd/.github/workflows/ci.yml@spack-v1-migration_TEST
23+
uses: access-nri/build-cd/.github/workflows/ci.yml@v8
2424
with:
2525
model: ${{ vars.NAME }}
2626
spack-manifest-schema-version: 2-0-0
@@ -34,5 +34,5 @@ jobs:
3434
pr-closed:
3535
name: Closed
3636
if: github.event.action == 'closed'
37-
uses: access-nri/build-cd/.github/workflows/ci-closed.yml@spack-v1-migration_TEST
37+
uses: access-nri/build-cd/.github/workflows/ci-closed.yml@v8
3838
secrets: inherit

config/versions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/4-0-0.json",
33
"spack": "1.1",
4-
"access-spack-packages": "api-v2"
4+
"access-spack-packages": "2026.02.002"
55
}

spack.yaml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,17 @@ spack:
1616
openmpi:
1717
require:
1818
- '@4.1.5'
19-
gcc-runtime:
19+
c:
2020
require:
21-
- '%access_gcc'
22-
23-
# Compilers
24-
intel-oneapi-compilers-classic:
21+
- 'intel-oneapi-compilers@2025.2.0'
22+
cxx:
2523
require:
26-
- '@2021.10.0'
27-
28-
all:
24+
- 'intel-oneapi-compilers@2025.2.0'
25+
fortran:
2926
require:
30-
- '%access_intel'
27+
- 'intel-oneapi-compilers@2025.2.0'
28+
all:
29+
prefer:
3130
- 'target=x86_64'
3231
view: true
3332
concretizer:

0 commit comments

Comments
 (0)