chore: upgrade spack to v1.1.0 by wdconinc · Pull Request #34 · eic/containers

wdconinc · 2025-11-15T00:31:41Z

Briefly, what does this PR introduce?

Needs:

This PR upgrades spack to v1.1.0, https://github.com/spack/spack/releases/tag/v1.1.0.

What kind of change does this PR introduce?

Bug fix (issue #__)
New feature (issue #__)
Documentation update
Other: __

Please check if this PR fulfills the following:

Tests for the changes have been added
Documentation has been added / updated
Changes have been communicated to collaborators

Does this PR introduce breaking changes? What changes might users need to make to their code?

No.

Does this PR change default behavior?

No.

Copilot

Pull Request Overview

This PR upgrades the Spack package manager version from v1.0.2 to v1.1.0 to incorporate the latest upstream changes and improvements from the Spack project.

Updates the SPACK_VERSION variable to reference the v1.1.0 release
Maintains existing cherry-picks for custom patches
No breaking changes or behavior modifications

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

containers/debian/Dockerfile

Removed llvm package requirement for gold.

Copilot

Pull request overview

Copilot reviewed 7 out of 7 changed files in this pull request and generated 3 comments.

Copilot · 2026-01-19T21:53:41Z

.gitlab-ci.yml

                   --build-arg ENV=${ENV}
+                   --build-arg SPACK_DUPLICATE_ALLOWLIST=$(
+                     case "${ENV}" in
+                       ci|ci_without_acts|cuda|dbg|jl|prod)
+                         echo "epic|llvm|py-setuptools|py-urllib3" ;;
+                       xl|tf)
+                         echo "epic|llvm|py-setuptools|py-urllib3|py-dask|py-dask-awkward|py-dask-histogram|py-distributed|py-requests" ;;
+                       *)
+                         echo "epic|llvm|py-setuptools|py-urllib3" ;;
+                     esac
+                   )


SPACK_DUPLICATE_ALLOWLIST is passed via command substitution and contains |, but the value is not quoted. After substitution, the shell will treat | as a pipeline operator (e.g. --build-arg ...=epic|llvm|...), which can break the docker buildx build invocation. Quote the substitution (e.g., assign to a variable and wrap in double quotes, or use --build-arg SPACK_DUPLICATE_ALLOWLIST="$(...)").

Copilot · 2026-01-19T21:53:42Z

containers/eic/Dockerfile

+| tee /tmp/duplicates_all.txt \
+| grep -Evw "(${SPACK_DUPLICATE_ALLOWLIST})" \
+| tee /tmp/duplicates_disallowed.txt


When SPACK_DUPLICATE_ALLOWLIST is empty (default), the grep regex becomes () and grep -Evw will exclude every line, making the duplicate-package check a no-op. Consider skipping the grep step when the allowlist is empty, or default the allowlist to a pattern that matches nothing so duplicates are still caught for local builds.

Suggested change

| tee /tmp/duplicates_all.txt \

| grep -Evw "(${SPACK_DUPLICATE_ALLOWLIST})" \

| tee /tmp/duplicates_disallowed.txt

| tee /tmp/duplicates_all.txt

if [ -n "${SPACK_DUPLICATE_ALLOWLIST}" ] ; then

grep -Evw "(${SPACK_DUPLICATE_ALLOWLIST})" /tmp/duplicates_all.txt \

| tee /tmp/duplicates_disallowed.txt

else

cat /tmp/duplicates_all.txt \

| tee /tmp/duplicates_disallowed.txt

fi

Copilot

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

Copilot

Pull request overview

Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.

Copilot · 2026-01-21T13:51:37Z

containers/eic/Dockerfile

 ENV SPACK_ENV=/opt/spack-environment/${ENV}
 ARG SPACK_FLAGS="--backtrace"
 ARG SPACK_INSTALL_FLAGS="--no-check-signature --show-log-on-error --yes-to-all"
+ARG SPACK_DUPLICATE_ALLOWLIST=""


SPACK_DUPLICATE_ALLOWLIST defaults to an empty string, but the subsequent grep -Evw "(${SPACK_DUPLICATE_ALLOWLIST})" will then effectively match every line (empty regex) and filter out all duplicates, disabling the duplicate-package check for builds that don’t explicitly pass the build-arg. Consider setting a safe default (e.g., a regex that matches nothing, or the current CI allowlist) or making the grep conditional when the allowlist is empty.

Suggested change

ARG SPACK_DUPLICATE_ALLOWLIST=""

ARG SPACK_DUPLICATE_ALLOWLIST="a^"

Copilot AI review requested due to automatic review settings November 15, 2025 00:31

Copilot started reviewing on behalf of wdconinc November 15, 2025 00:32 View session

Copilot finished reviewing on behalf of wdconinc November 15, 2025 00:32

Copilot AI reviewed Nov 15, 2025

View reviewed changes

wdconinc changed the title ~~Upgrade spack to v1.1.0~~ Upgrade Spack to v1.1.0 Nov 15, 2025

wdconinc force-pushed the spack-1.1.0 branch from d83f05f to 28b4f41 Compare November 16, 2025 03:05

This comment was marked as resolved.

Sign in to view

This comment was marked as off-topic.

Sign in to view

wdconinc force-pushed the spack-1.1.0 branch from 28b4f41 to 6893049 Compare November 18, 2025 23:53

wdconinc commented Nov 19, 2025

View reviewed changes

containers/debian/Dockerfile Outdated Show resolved Hide resolved

wdconinc force-pushed the spack-1.1.0 branch 8 times, most recently from 8cc24d5 to 8d3576f Compare November 21, 2025 21:46

wdconinc mentioned this pull request Nov 23, 2025

chore: upgrade spack-packages to v2025.11.0 #35

Merged

13 tasks

wdconinc force-pushed the spack-1.1.0 branch from 8d3576f to 515068c Compare November 24, 2025 02:19

Copilot AI review requested due to automatic review settings November 26, 2025 01:59

Copilot started reviewing on behalf of wdconinc November 26, 2025 02:04 View session

Copilot finished reviewing on behalf of wdconinc November 26, 2025 02:08

This comment was marked as resolved.

Sign in to view

Copilot AI review requested due to automatic review settings November 26, 2025 02:19

Copilot started reviewing on behalf of wdconinc November 26, 2025 02:26 View session

Copilot finished reviewing on behalf of wdconinc November 26, 2025 02:27

This comment was marked as resolved.

Sign in to view

Copilot AI review requested due to automatic review settings November 26, 2025 14:12

Copilot started reviewing on behalf of wdconinc November 26, 2025 14:15 View session

This comment was marked as resolved.

Sign in to view

wdconinc added 12 commits January 17, 2026 12:17

Upgrade spack to v1.1.0

5b15a8d

fix: create directory for Spack user scope configuration

a7bee4b

fix: build argument for spack duplicates

3e3e741

Remove llvm gold requirement from packages.yaml

77a6132

Removed llvm package requirement for gold.

fix: concretizer: unify: when_possible due to py-numba ^llvm@15

c0c4100

fix: packages: pin or constrain py-numpy and swig

cde63bb

fix: pass duplicate allow list with matrix; default to empty

57a0e4c

fix: avoid premature error on grep -v

e93ddf2

fix: tee to duplicates_all.txt

84c7247

fix: revert back from set -ex to set -e

a36aa1b

fix: be explicit about language/compiler providers

ea3120a

fix: rename scope site -> spack

3394278

wdconinc force-pushed the spack-1.1.0 branch from 7098a9e to 3394278 Compare January 17, 2026 18:19

Copilot AI review requested due to automatic review settings January 17, 2026 18:19

Copilot started reviewing on behalf of wdconinc January 17, 2026 18:19 View session

This comment was marked as resolved.

Sign in to view

fix: reduce duplicate allow list for cuda on eicweb

0a10279

Copilot AI review requested due to automatic review settings January 18, 2026 15:30

Copilot started reviewing on behalf of wdconinc January 18, 2026 15:31 View session

This comment was marked as resolved.

Sign in to view

feat: build eic_tf to target final on GitHub

9a79ddb

Copilot AI review requested due to automatic review settings January 19, 2026 21:43

Copilot started reviewing on behalf of wdconinc January 19, 2026 21:46 View session

Copilot AI reviewed Jan 19, 2026

View reviewed changes

fix: abseil-cpp: require: cxxstd=17

f3f74ac

Copilot AI review requested due to automatic review settings January 21, 2026 13:38

Copilot started reviewing on behalf of wdconinc January 21, 2026 13:39 View session

Copilot AI reviewed Jan 21, 2026

View reviewed changes

	ARG SPACK_DUPLICATE_ALLOWLIST=""
	ARG SPACK_DUPLICATE_ALLOWLIST="a^"

Conversation

wdconinc commented Nov 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Briefly, what does this PR introduce?

What kind of change does this PR introduce?

Please check if this PR fulfills the following:

Does this PR introduce breaking changes? What changes might users need to make to their code?

Does this PR change default behavior?

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

This comment was marked as resolved.

This comment was marked as off-topic.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Jan 19, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 19, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Jan 21, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

wdconinc commented Nov 15, 2025 •

edited

Loading