From 6cf3fd84abd7917e5d8e0fad56c2cb913eaa0832 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Mon, 18 May 2026 18:20:11 -0500 Subject: [PATCH 1/5] feat: pass GITHUB_SPACK_TOKEN secret for access private repos --- .github/workflows/build-push.yml | 1 + .gitlab-ci.yml | 1 + containers/eic/Dockerfile | 14 ++++++++++++++ 3 files changed, 16 insertions(+) diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml index 95a51404..b2ab61c6 100644 --- a/.github/workflows/build-push.yml +++ b/.github/workflows/build-push.yml @@ -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.GITHUB_SPACK_TOKEN }}" secret-files: | mirrors=mirrors.yaml platforms: ${{ matrix.PLATFORM }} diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d7d701bd..e8e27344 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 diff --git a/containers/eic/Dockerfile b/containers/eic/Dockerfile index 9bc99e13..a5ba42df 100644 --- a/containers/eic/Dockerfile +++ b/containers/eic/Dockerfile @@ -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 \ < ~/.netrc + chmod 600 ~/.netrc +fi export CCACHE_DIR=/ccache spack ${SPACK_FLAGS} install ${SPACK_INSTALL_FLAGS} spack clean --downloads --stage +rm -f ~/.netrc ccache --show-stats ccache --zero-stats EOF @@ -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 \ < ~/.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 From c9d4e1df8542987f0184abd60b804f6036f924c9 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Mon, 18 May 2026 18:30:46 -0500 Subject: [PATCH 2/5] fix: rename token to avoid GITHUB_* Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- .github/workflows/build-push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml index b2ab61c6..03f1ade8 100644 --- a/.github/workflows/build-push.yml +++ b/.github/workflows/build-push.yml @@ -541,7 +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.GITHUB_SPACK_TOKEN }}" + "SPACK_GITHUB_TOKEN=${{ secrets.SPACK_GITHUB_TOKEN }}" secret-files: | mirrors=mirrors.yaml platforms: ${{ matrix.PLATFORM }} From f0037d0f4b0dc16fc438d1bbd12f85ccb3beae3d Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Mon, 18 May 2026 18:44:00 -0500 Subject: [PATCH 3/5] fix: update token name in second place too Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- .github/workflows/build-push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml index 03f1ade8..83c2cca2 100644 --- a/.github/workflows/build-push.yml +++ b/.github/workflows/build-push.yml @@ -541,7 +541,7 @@ jobs: "CI_REGISTRY_PASSWORD=${{ secrets.GHCR_REGISTRY_TOKEN }}" "GITHUB_REGISTRY_USER=${{ secrets.GHCR_REGISTRY_USER }}" "GITHUB_REGISTRY_TOKEN=${{ secrets.GHCR_REGISTRY_TOKEN }}" - "SPACK_GITHUB_TOKEN=${{ secrets.SPACK_GITHUB_TOKEN }}" + "GITHUB_SPACK_TOKEN=${{ secrets.SPACK_GITHUB_TOKEN }}" secret-files: | mirrors=mirrors.yaml platforms: ${{ matrix.PLATFORM }} From 276e274addf82caa6e336262009f93f261cdbd2c Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Mon, 18 May 2026 18:44:35 -0500 Subject: [PATCH 4/5] fix: eic-spack: dawn(cut): add main version --- eic-spack.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eic-spack.sh b/eic-spack.sh index eac402dc..08351f4c 100644 --- a/eic-spack.sh +++ b/eic-spack.sh @@ -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" From 6061e836c080b157b88a58903a6edd8f9ef12da4 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Mon, 18 May 2026 18:45:23 -0500 Subject: [PATCH 5/5] fix: packages: dawn(cut): require: @main --- spack-environment/packages.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml index 6d896181..066ea1aa 100644 --- a/spack-environment/packages.yaml +++ b/spack-environment/packages.yaml @@ -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,