Skip to content

Commit 32cc821

Browse files
CodeGatCodeGat
authored
[skip ci] infra: Update to v6 (#2)
1 parent b9a55f9 commit 32cc821

5 files changed

Lines changed: 51 additions & 65 deletions

File tree

‎.github/CODEOWNERS‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Tommy needs to review changes to infra
2+
/.github/ @CodeGat
3+

‎.github/workflows/cd.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@ on:
1010
jobs:
1111
cd:
1212
name: CD
13-
uses: access-nri/build-cd/.github/workflows/cd.yml@v5
13+
uses: access-nri/build-cd/.github/workflows/cd.yml@v6
1414
with:
1515
model: ${{ vars.NAME }}
16+
spack-manifest-schema-version: 1-0-7
17+
config-versions-schema-version: 3-0-0
18+
config-packages-schema-version: 1-0-0
1619
permissions:
1720
contents: write
1821
# This is due to the entrypoint also handling `on.pull_request` events

‎.github/workflows/ci.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,35 +24,35 @@ jobs:
2424
pr-ci:
2525
name: CI
2626
if: >-
27-
(github.event_name == 'pull_request' && github.event.action != 'closed') ||
28-
(github.event_name == 'issue_comment' && startsWith(github.event.comment.body, '!redeploy'))
29-
uses: access-nri/build-cd/.github/workflows/ci.yml@v5
27+
(github.event_name == 'pull_request' && github.event.action != 'closed') || (github.event_name == 'issue_comment' && startsWith(github.event.comment.body, '!redeploy'))
28+
uses: access-nri/build-cd/.github/workflows/ci.yml@v6
3029
with:
3130
model: ${{ vars.NAME }}
3231
# root-sbd: if different from vars.NAME
3332
pr: ${{ github.event_name == 'pull_request' && github.event.pull_request.number || github.event.issue.number }}
33+
spack-manifest-schema-version: 1-0-7
34+
config-versions-schema-version: 3-0-0
35+
config-packages-schema-version: 1-0-0
3436
permissions:
3537
pull-requests: write
3638
contents: write
3739
statuses: write
3840
secrets: inherit
39-
4041
pr-comment:
4142
name: Comment
4243
if: github.event_name == 'issue_comment'
43-
uses: access-nri/build-cd/.github/workflows/ci-comment.yml@v5
44+
uses: access-nri/build-cd/.github/workflows/ci-comment.yml@v6
4445
with:
4546
model: ${{ vars.NAME }}
4647
# root-sbd: if different from vars.NAME
4748
permissions:
4849
pull-requests: write
4950
contents: write
5051
secrets: inherit
51-
5252
pr-closed:
5353
name: Closed
5454
if: github.event_name == 'pull_request' && github.event.action == 'closed'
55-
uses: access-nri/build-cd/.github/workflows/ci-closed.yml@v5
55+
uses: access-nri/build-cd/.github/workflows/ci-closed.yml@v6
5656
with:
5757
root-sbd: ${{ vars.NAME }} # or something else, if different from vars.NAME
5858
secrets: inherit

‎config/packages.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/packages/1-0-0.json",
3+
"provenance": [
4+
"roms"
5+
],
6+
"injection": [
7+
"openmpi"
8+
]
9+
}

‎spack.yaml‎

Lines changed: 28 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,33 @@
55
spack:
66
# TODO: This section is used primarily to provide variations to a model based on deployment target. Delete if not required.
77
# definitions:
8-
# This is the root spack bundle that contains the model
9-
# - ROOT_PACKAGE:
10-
# - MODEL@git.GIT_REF=SPACK_VERSION
8+
# This is the root spack bundle that contains the model
9+
# - ROOT_PACKAGE:
10+
# - MODEL@git.GIT_REF=SPACK_VERSION
1111

12-
# Mutually-exclusive Compiler and Target definitions (assumes DEPLOYMENT_TARGET set)
13-
# - when: env['DEPLOYMENT_TARGET'] == 'Gadi'
14-
# compiler_target: ['%intel@19.0.5.281 target=x86_64_v4']
15-
# More mutually-exclusive definitions can be made...
16-
# Default
17-
# - when: "'DEPLOYMENT_TARGET' not in env"
18-
# compiler_targets: ['intel@2021.2.0 target=x86_64']
19-
20-
# This is where the single definitions of ROOT_PACKAGE and compiler/target are
21-
# matrixed together to form a single spec: MODEL@git.GIT_REF=SPACK_VERSION %intel@2021.2.0 target=x86_64
22-
# - ROOT_SPEC:
23-
# - matrix:
24-
# - [$ROOT_PACKAGE]
25-
# - [$%compiler_target]
12+
# Mutually-exclusive Compiler and Target definitions (assumes DEPLOYMENT_TARGET set)
13+
# - when: env['DEPLOYMENT_TARGET'] == 'Gadi'
14+
# compiler_target: ['%intel@19.0.5.281 target=x86_64_v4']
15+
# More mutually-exclusive definitions can be made...
16+
# Default
17+
# - when: "'DEPLOYMENT_TARGET' not in env"
18+
# compiler_targets: ['intel@2021.2.0 target=x86_64']
2619

20+
# This is where the single definitions of ROOT_PACKAGE and compiler/target are
21+
# matrixed together to form a single spec: MODEL@git.GIT_REF=SPACK_VERSION %intel@2021.2.0 target=x86_64
22+
# - ROOT_SPEC:
23+
# - matrix:
24+
# - [$ROOT_PACKAGE]
25+
# - [$%compiler_target]
2726
specs:
28-
# The root Spack Bundle Recipe (SBR) for the model and overall version of
29-
# the deployment:
30-
# TODO: Replace the MODEL, GIT_REF and SPACK_VERSION, if there is
31-
# only one deployment target
32-
# - MODEL@git.GIT_REF=SPACK_VERSION
33-
# Alternatively, if there are multiple deployment targets that require
34-
# different compilers/variants, use the above definitions section and:
35-
# - $ROOT_SPEC
27+
# The root Spack Bundle Recipe (SBR) for the model and overall version of
28+
# the deployment:
29+
# TODO: Replace the MODEL, GIT_REF and SPACK_VERSION, if there is
30+
# only one deployment target
31+
# - MODEL@git.GIT_REF=SPACK_VERSION
32+
# Alternatively, if there are multiple deployment targets that require
33+
# different compilers/variants, use the above definitions section and:
34+
# - $ROOT_SPEC
3635
packages:
3736
# Specification of dependency versions and variants. CI/CD requires that
3837
# the first element of the require is only a version:
@@ -43,38 +42,10 @@ spack:
4342

4443
# Specifications that apply to all packages
4544
all:
46-
# TODO: Specify compiler/targets for all packages
47-
# require:
48-
# - '%intel@2021.10.0'
49-
# - 'target=x86_64'
45+
# TODO: Specify compiler/targets for all packages
46+
# require:
47+
# - '%intel@2021.10.0'
48+
# - 'target=x86_64'
5049
view: true
5150
concretizer:
5251
unify: true
53-
modules:
54-
default:
55-
tcl:
56-
include:
57-
# TODO: Add MODEL and PACKAGEs that will have a corresponding module
58-
# - MODEL
59-
# - PACKAGE1
60-
# - PACKAGE2
61-
projections:
62-
# These projection GIT_REFs must be the same as the
63-
# `spack.packages.*.require[0]` ref but without the `@git.`
64-
# and without the '=SPACK_VERSION', if there is one.
65-
#
66-
# For a MODEL, an example projection is `{name}/2024.10.0`.
67-
# For a PACKAGE where `require` @git.GIT_REF=SPACK_VERSION is
68-
# `@git.2024.04.21=access-esm1.5`, the projection becomes
69-
# `{name}/2024.04.21-{hash:7}`.
70-
# TODO: Add explicit projections for modules that will be found with
71-
# `module load`.
72-
# MODEL: '{name}/VERSION'
73-
# PACKAGE1: '{name}/VERSION1-{hash:7}'
74-
# PACKAGE2: '{name}/VERSION2-{hash:7}'
75-
# config:
76-
# overridden spack configurations, if needed
77-
# mirrors:
78-
# overridden spack package tarball directories, if needed
79-
# repos:
80-
# overridden repo sources, if needed

0 commit comments

Comments
 (0)
⚡