Skip to content

Commit 3fbe4be

Browse files
authored
[no ci] Infra Update v8: spack v1 Support (#12)
* [no ci] infra: Update to v8 * [no ci] infra: Update spack version to v1.1, update manifest schema to 2-0-0 * [no ci] spack.yaml: Add reserved definitions, Use toolchains * [no ci] Remove inputs.pr, updated versions in ci-comment * [no ci] Update config/versions.json access-spack-packages version to common api-v2 tag * [no ci] Update language specification
1 parent 9f3d0cc commit 3fbe4be

5 files changed

Lines changed: 35 additions & 28 deletions

File tree

.github/workflows/cd.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ on:
1010
jobs:
1111
cd:
1212
name: CD
13-
uses: access-nri/build-cd/.github/workflows/cd.yml@v7
13+
uses: access-nri/build-cd/.github/workflows/cd.yml@v8
1414
with:
1515
model: ${{ vars.NAME }}
16-
spack-manifest-schema-version: 1-0-7
17-
config-versions-schema-version: 3-0-0
16+
spack-manifest-schema-version: 2-0-0
17+
config-versions-schema-version: 4-0-0
1818
config-packages-schema-version: 1-0-0
1919
permissions:
2020
contents: write

.github/workflows/ci-command.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@ 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@v7
11+
uses: access-nri/build-cd/.github/workflows/ci.yml@v8
1212
with:
1313
model: ${{ vars.NAME }}
14-
pr: ${{ github.event.issue.number }}
15-
spack-manifest-schema-version: 1-0-7
16-
config-versions-schema-version: 3-0-0
14+
spack-manifest-schema-version: 2-0-0
15+
config-versions-schema-version: 4-0-0
1716
config-packages-schema-version: 1-0-0
1817
permissions:
1918
pull-requests: write
@@ -23,7 +22,7 @@ jobs:
2322
bump:
2423
name: Bump
2524
if: startsWith(github.event.comment.body, '!bump') && github.event.issue.pull_request
26-
uses: access-nri/build-cd/.github/workflows/ci-comment.yml@v7
25+
uses: access-nri/build-cd/.github/workflows/ci-comment.yml@v8
2726
with:
2827
model: ${{ vars.NAME }}
2928
permissions:
@@ -33,7 +32,7 @@ jobs:
3332
configs:
3433
name: Configs
3534
if: startsWith(github.event.comment.body, '!update-configs') && github.event.issue.pull_request
36-
uses: access-nri/build-cd/.github/workflows/ci-command-configs.yml@v7
35+
uses: access-nri/build-cd/.github/workflows/ci-command-configs.yml@v8
3736
with:
3837
model: ${{ vars.NAME }}
3938
auto-configs-pr-schema-version: 1-0-0

.github/workflows/ci.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,12 @@ on:
1919
jobs:
2020
pr-ci:
2121
name: CI
22-
if: >-
23-
github.event.action != 'closed'
24-
uses: access-nri/build-cd/.github/workflows/ci.yml@v7
22+
if: github.event.action != 'closed'
23+
uses: access-nri/build-cd/.github/workflows/ci.yml@v8
2524
with:
2625
model: ${{ vars.NAME }}
27-
# root-sbd: if different from vars.NAME
28-
pr: ${{ github.event.pull_request.number }}
29-
spack-manifest-schema-version: 1-0-7
30-
config-versions-schema-version: 3-0-0
26+
spack-manifest-schema-version: 2-0-0
27+
config-versions-schema-version: 4-0-0
3128
config-packages-schema-version: 1-0-0
3229
permissions:
3330
pull-requests: write
@@ -37,7 +34,5 @@ jobs:
3734
pr-closed:
3835
name: Closed
3936
if: github.event.action == 'closed'
40-
uses: access-nri/build-cd/.github/workflows/ci-closed.yml@v7
41-
with:
42-
root-sbd: ${{ vars.NAME }}
37+
uses: access-nri/build-cd/.github/workflows/ci-closed.yml@v8
4338
secrets: inherit

config/versions.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://github.com/ACCESS-NRI/schema/blob/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json",
3-
"spack": "0.22",
4-
"spack-packages": "SOME_SPECIFIC_TAG"
2+
"$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/4-0-0.json",
3+
"spack": "1.1",
4+
"access-spack-packages": "2026.02.002"
55
}

spack.yaml

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,38 @@
33
# It describes a set of packages to be installed, along with
44
# configuration settings.
55
spack:
6+
definitions:
7+
# _name and _version are reserved definitions that inform build-cd deployments, and have no effect otherwise
8+
- _name: # [DEPLOYMENT_NAME_HERE]
9+
- _version: # [DEPLOYMENT_VERSION_HERE]
610
specs:
711
# The root Spack Bundle Recipe (SBR) for the model and overall version of
812
# the deployment:
9-
# TODO: Replace the MODEL and VERSION.
10-
# - MODEL@git.VERSION
13+
# TODO: Replace the MODEL.
14+
# - MODEL
1115
packages:
1216
# Specification of dependency versions and variants. CI/CD requires that
1317
# the first element of the require is only a version:
1418
# TODO: Specify versions and variants of dependencies as required.
1519
# openmpi:
1620
# require:
17-
# - '@4.1.5'
21+
# - '@4.1.5'
1822

23+
# Compilers
24+
# c:
25+
# require:
26+
# - intel-oneapi-compilers-classic@19.0.5.281
27+
# cxx:
28+
# require:
29+
# - intel-oneapi-compilers-classic@19.0.5.281
30+
# fortran:
31+
# require:
32+
# - intel-oneapi-compilers-classic@19.0.5.281
1933
# Specifications that apply to all packages
2034
all:
21-
# TODO: Specify compiler/targets for all packages
35+
# TODO: Specify targets for all packages
2236
# require:
23-
# - '%intel@19.0.5.281'
24-
# - 'target=x86_64'
37+
# - 'target=x86_64_v3'
2538
view: true
2639
concretizer:
2740
unify: true

0 commit comments

Comments
 (0)