Skip to content

Commit 4d12d1b

Browse files
committed
Use celeritas fork of spack
1 parent 0d22b68 commit 4d12d1b

File tree

2 files changed

+5
-12
lines changed

2 files changed

+5
-12
lines changed

.github/workflows/build.yaml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ on:
1414

1515
env:
1616
SPACK_BACKTRACE: 1
17-
SPACK_REF: 38309ced3344d06168c25482083fc733bb654a63 # develop@2025-03-17
1817

1918
jobs:
2019
rebuild:
@@ -26,19 +25,13 @@ jobs:
2625
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
2726

2827
- name: Setup Spack
29-
uses: spack/setup-spack@5792f7c7055c3707819380b5e3831d2be6e64b6c # 2024/12
28+
uses: sethrj/setup-spack@200141be54665bd75af4dbb131d08d24ea606a9c
3029
with:
31-
ref: ${{env.SPACK_REF}}
30+
repository: celeritas-project/spack
31+
ref: 84476f6f35ee367a3c8c4247edcde66441cee5e6 # ci @ 12 May 2025
3232
buildcache: true
3333
color: true
3434

35-
- name: Patch spack # To be deleted; see associated github pulls
36-
working-directory: spack
37-
run: |
38-
for id in 50039; do
39-
curl -LfsS "https://github.com/spack/spack/pull/${id}.diff" | patch >
40-
done
41-
4235
- name: Find compilers
4336
run: spack -e . compiler find --mixed-toolchain
4437

spack.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ spack:
55
- - ccache
66
- cli11 +pic
77
- cmake
8-
- "covfie@0.13:"
8+
- "covfie@0.14:"
99
- googletest cxxstd=20
1010
- googletest cxxstd=17
1111
- ninja
@@ -23,7 +23,7 @@ spack:
2323
- 'geant4@11.1 cxxstd=20'
2424
- 'geant4@11.2 cxxstd=20'
2525
- 'geant4@11.3 cxxstd=20'
26-
- g4vg
26+
- 'g4vg@1.0.4:'
2727
concretizer:
2828
unify: false
2929
config:

0 commit comments

Comments
 (0)