Skip to content

Commit 4223eba

Browse files
CodeGatdougiesquire
authored andcommitted
build-ci v3: Update Infra For spack v1 (#32)
1 parent 46c894f commit 4223eba

4 files changed

Lines changed: 20 additions & 11 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"oneapi_compiler": "oneapi@2025.2.0",
2+
"oneapi_compiler_version": "2025.2.0",
33
"target": "x86_64"
44
}

.github/build-ci/manifests/oneapi_access-om3_asymm.spack.yaml.j2

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,15 @@ spack:
1313
- '@git.{{ ref }} +asymmetric_mem'
1414
gcc-runtime:
1515
require:
16-
- '%gcc target={{ target }}'
16+
- '%access_gcc'
17+
- 'target={{ target }}'
18+
intel-oneapi-compilers:
19+
require:
20+
- '@{{ oneapi_compiler_version }}'
1721
all:
1822
require:
19-
- '%{{ oneapi_compiler }} target={{ target }}'
23+
- '%access_oneapi'
24+
- 'target={{ target }}'
2025
concretizer:
2126
unify: false
2227
view: false

.github/build-ci/manifests/oneapi_access-om3_no-asymm.spack.yaml.j2

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,15 @@ spack:
1313
- '@git.{{ ref }} ~asymmetric_mem'
1414
gcc-runtime:
1515
require:
16-
- '%gcc target={{ target }}'
16+
- '%access_gcc'
17+
- 'target={{ target }}'
18+
intel-oneapi-compilers:
19+
require:
20+
- '@{{ oneapi_compiler_version }}'
1721
all:
1822
require:
19-
- '%{{ oneapi_compiler }} target={{ target }}'
23+
- '%access_oneapi'
24+
- 'target={{ target }}'
2025
concretizer:
2126
unify: false
2227
view: false

.github/workflows/ci.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,12 @@ jobs:
2929
max-parallel: 5
3030
matrix:
3131
file: ${{ fromJson(needs.pre-ci.outputs.matrix) }}
32-
uses: access-nri/build-ci/.github/workflows/ci.yml@v2
32+
uses: access-nri/build-ci/.github/workflows/ci.yml@v3
3333
with:
3434
spack-manifest-path: ${{ matrix.file }}
3535
allow-ssh-into-spack-install: false # If true, PR author must ssh into instance to complete job
3636
spack-manifest-data-path: .github/build-ci/data/standard.json
37-
spack-packages-ref: api-v2
38-
# FIXME: This is a workaround for having a spack 1.0 runner using a spack 0.22 upstream, and should be removed once we transition to a 1.0 upstream
39-
spack-config-ref: 74-perl-buildable
40-
spack-ref: releases/v1.0
41-
container-image-version: :rocky-v1.0-2025.09.002
37+
# builtin-spack-packages-ref: develop
38+
# access-spack-packages-ref: api-v2
39+
# spack-config-ref: main
40+
# spack-ref: releases/v1.1

0 commit comments

Comments
 (0)