Skip to content

Commit 7f7304a

Browse files
Sbozzolohughcars
authored andcommitted
Fix container action using local spack recipe
The PalaceDockerfile was symlinking the local copy of the palace recipe but never adding it to spack, so the container was being built with the published version
1 parent 8aaf59e commit 7f7304a

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

.github/actions/build-container/spack_env/PalaceDockerfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,13 @@ RUN test -f /opt/palace/CMakeLists.txt || \
1616

1717
# Set up spack repo and apply patches to builtin spack packages
1818
RUN mkdir -p /opt/spack-environment && \
19+
# Link our local spack repo to /opt/spack-environment
1920
ln -s /opt/palace/spack_repo /opt/spack-environment/spack_repo && \
21+
# Add it to spack
22+
spack repo add /opt/palace/spack_repo/local && \
23+
# Workaround for https://github.com/spack/spack/issues/51505
2024
ln -sf $(spack location --repo builtin)/packages/mfem /opt/palace/spack_repo/local/packages/mfem && \
25+
# Apply patches to builtin repo
2126
cd $(cd $(spack location --repo builtin) && git rev-parse --show-toplevel) && \
2227
for patch in /opt/palace/spack_repo/patches/*.diff; do \
2328
if [ -f "$patch" ]; then \

.github/actions/build-container/spack_env/spack.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@ spack:
3434
images:
3535
os: "ubuntu:24.04"
3636
spack: develop
37-
# Use Palace's local spack repo so our palace package (with its MFEM patches)
38-
# overrides the builtin one.
39-
repos:
40-
- spack_repo/local
4137
# Find pre-compiled packages in binary caches. Requires GITHUB_USER and
4238
# GITHUB_TOKEN (or a personal access token).
4339
#

0 commit comments

Comments
 (0)