Skip to content

feat: pass GITHUB_SPACK_TOKEN secret for access private repos #296

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
wdconinc wants to merge 5 commits into
base: master
Choose a base branch
from
+19 −3
Open

feat: pass GITHUB_SPACK_TOKEN secret for access private repos #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6cf3fd8
feat: pass GITHUB_SPACK_TOKEN secret for access private repos
wdconinc May 18, 2026
c9d4e1d
fix: rename token to avoid GITHUB_*
wdconinc May 18, 2026
f0037d0
fix: update token name in second place too
wdconinc May 18, 2026
276e274
fix: eic-spack: dawn(cut): add main version
wdconinc May 18, 2026
6061e83
fix: packages: dawn(cut): require: @main
wdconinc May 18, 2026
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/build-push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,7 @@ jobs:
"CI_REGISTRY_PASSWORD=${{ secrets.GHCR_REGISTRY_TOKEN }}"
"GITHUB_REGISTRY_USER=${{ secrets.GHCR_REGISTRY_USER }}"
"GITHUB_REGISTRY_TOKEN=${{ secrets.GHCR_REGISTRY_TOKEN }}"
"GITHUB_SPACK_TOKEN=${{ secrets.SPACK_GITHUB_TOKEN }}"
secret-files: |
mirrors=mirrors.yaml
platforms: ${{ matrix.PLATFORM }}
Expand Down
1 change: 1 addition & 0 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,7 @@ eic:
--secret type=env,id=CI_REGISTRY_PASSWORD,env=CI_REGISTRY_PASSWORD
--secret type=env,id=GITHUB_REGISTRY_USER,env=GITHUB_REGISTRY_USER
--secret type=env,id=GITHUB_REGISTRY_TOKEN,env=GITHUB_REGISTRY_TOKEN
--secret type=env,id=GITHUB_SPACK_TOKEN,env=GITHUB_SPACK_TOKEN
--provenance false
containers/eic
2>&1 | tee build.log
Expand Down
14 changes: 14 additions & 0 deletions containers/eic/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,18 @@ RUN --mount=type=cache,target=/ccache,id=ccache-${TARGETPLATFORM} \
--mount=type=secret,id=CI_REGISTRY_PASSWORD,env=CI_REGISTRY_PASSWORD \
--mount=type=secret,id=GITHUB_REGISTRY_USER,env=GITHUB_REGISTRY_USER \
--mount=type=secret,id=GITHUB_REGISTRY_TOKEN,env=GITHUB_REGISTRY_TOKEN \
--mount=type=secret,id=GITHUB_SPACK_TOKEN \
<<EOF
set -e
if [ -s /run/secrets/GITHUB_SPACK_TOKEN ]; then
printf 'machine github.com login x-access-token password %s\n' \
"$(cat /run/secrets/GITHUB_SPACK_TOKEN)" > ~/.netrc
chmod 600 ~/.netrc
fi
export CCACHE_DIR=/ccache
spack ${SPACK_FLAGS} install ${SPACK_INSTALL_FLAGS}
spack clean --downloads --stage
rm -f ~/.netrc
Comment thread
wdconinc marked this conversation as resolved.
ccache --show-stats
ccache --zero-stats
EOF
Expand Down Expand Up @@ -242,12 +249,19 @@ RUN --mount=type=cache,target=/ccache,id=ccache-${TARGETPLATFORM} \
--mount=type=secret,id=CI_REGISTRY_PASSWORD,env=CI_REGISTRY_PASSWORD \
--mount=type=secret,id=GITHUB_REGISTRY_USER,env=GITHUB_REGISTRY_USER \
--mount=type=secret,id=GITHUB_REGISTRY_TOKEN,env=GITHUB_REGISTRY_TOKEN \
--mount=type=secret,id=GITHUB_SPACK_TOKEN \
<<EOF
set -e
if [ -s /run/secrets/GITHUB_SPACK_TOKEN ]; then
printf 'machine github.com login x-access-token password %s\n' \
"$(cat /run/secrets/GITHUB_SPACK_TOKEN)" > ~/.netrc
chmod 600 ~/.netrc
fi
export CCACHE_DIR=/ccache
spack ${SPACK_FLAGS} install ${SPACK_INSTALL_FLAGS}
spack clean --downloads --stage
spack gc --yes-to-all go go-bootstrap rust rust-bootstrap py-setuptools-rust py-maturin
rm -f ~/.netrc
ccache --show-stats
ccache --zero-stats
EOF
Expand Down
2 changes: 1 addition & 1 deletion eic-spack.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ EICSPACK_ORGREPO="eic/eic-spack"

## EIC spack commit hash or github version, e.g. v0.19.7
## note: nightly builds could use a branch e.g. releases/v0.19
EICSPACK_VERSION="ce2dc68e4f75299f7a684708788870282ecde53a"
EICSPACK_VERSION="45f676694035d99722fb3f89423ff94329c4df2b"
4 changes: 2 additions & 2 deletions spack-environment/packages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,10 @@ packages:
- '@10bbcdbf2be3ad3aa56febcf4c7662d771460a99'
dawn:
require:
- '@3_91a'
- '@main'
dawncut:
require:
- '@1_54a'
- '@main'
dbus:
require:
# Until 1.15.12, https://gitlab.freedesktop.org/dbus/dbus/-/commit/b104667bd7ec55dda057ff4ffdde848336f253f4,
Expand Down
Loading