Skip to content

Replace git clone spack-packages with spack repo add command #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+3 −3
Open

Replace git clone spack-packages with spack repo add command #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2327288
Replace git clone spack-packages with spack repo add command
wdconinc Nov 6, 2025
25bc80c
Add conditional push to EICweb on push event
wdconinc Nov 6, 2025
9312a51
Update spack repo commands in Dockerfile
wdconinc Nov 6, 2025
afa8ba1
Change spack repo update from branch to tag
wdconinc Nov 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/mirror.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
with:
fetch-depth: 0
- name: Push to EICweb
if: ${{ github.event_name == 'push' }}
uses: eic/gitlab-sync@master
with:
url: https://eicweb.phy.anl.gov/containers/eic_container.git/
Expand Down
5 changes: 2 additions & 3 deletions containers/debian/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,8 @@ ARG SPACKPACKAGES_CHERRYPICKS_FILES=""
ADD https://api.github.com/repos/${SPACKPACKAGES_ORGREPO}/commits/${SPACKPACKAGES_VERSION} /tmp/spack-packages.json
RUN <<EOF
set -e
git clone --filter=tree:0 https://github.com/${SPACKPACKAGES_ORGREPO}.git ${SPACKPACKAGES_ROOT}
git -C ${SPACKPACKAGES_ROOT} checkout ${SPACKPACKAGES_VERSION}
spack repo add --scope site --name builtin https://github.com/${SPACKPACKAGES_ORGREPO}.git ${SPACKPACKAGES_ROOT}
spack repo update --scope site --tag ${SPACKPACKAGES_VERSION} builtin
if [ -n "${SPACKPACKAGES_CHERRYPICKS}" ] ; then
SPACKPACKAGES_CHERRYPICKS=$(git -C ${SPACKPACKAGES_ROOT} rev-list --topo-order ${SPACKPACKAGES_CHERRYPICKS} | grep -m $(echo ${SPACKPACKAGES_CHERRYPICKS} | wc -w) "${SPACKPACKAGES_CHERRYPICKS}" | tac)
eval "declare -A SPACKPACKAGES_CHERRYPICKS_FILES_ARRAY=(${SPACKPACKAGES_CHERRYPICKS_FILES})"
Expand All @@ -210,7 +210,6 @@ if [ -n "${SPACKPACKAGES_CHERRYPICKS}" ] ; then
done
fi
git -C ${SPACKPACKAGES_ROOT} gc --prune=all --aggressive
spack repo add --scope site "${SPACKPACKAGES_ROOT}/repos/spack_repo/builtin"
EOF

## Setup build configuration
Expand Down
Loading