Skip to content

feat: spack: views: collapse unique subtrees in symlink case #210

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 2 commits into
base: master
Choose a base branch
from
Open

feat: spack: views: collapse unique subtrees in symlink case #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee7bd74
feat: spack: views: collapse unique subtrees in symlink case
wdconinc Mar 24, 2026
a46fea0
docs: mark cherry-pick lists in spack-environment.md as illustrative …
Copilot Mar 24, 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
16 changes: 14 additions & 2 deletions docs/spack-environment.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,14 +145,26 @@ spack:

### Cherry-picks

Spack versions can include cherry-picks from newer commits:
Spack versions can include cherry-picks from newer commits. The commit hashes listed
below are illustrative only — the actual cherry-picks applied may differ from what
is shown here. Refer to `spack.sh` and `spack-packages.sh` for the current lists.

```bash
# From spack.sh
# From spack.sh (illustrative — see spack.sh for actual commits)
SPACK_VERSION="v1.1.0"
SPACK_CHERRYPICKS=$(cat <<- EOF
09f75ee426a2e05e0543570821582480ff823ba5
a462612b64e97fa7dfe461c32c58553fd6ec63c5
# ... (additional commits may be present)
EOF
)

# From spack-packages.sh (illustrative — see spack-packages.sh for actual commits)
SPACKPACKAGES_VERSION="v2025.11.0"
SPACKPACKAGES_CHERRYPICKS=$(cat <<- EOF
a115a811bdfce4db5298a9ba9b7903ccfb0de101
22dadd619053ff0872903549db616200bda082f0
# ... (additional commits may be present)
EOF
)
```
Expand Down
2 changes: 2 additions & 0 deletions spack.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ read -r -d '' SPACK_CHERRYPICKS <<- \
09f75ee426a2e05e0543570821582480ff823ba5
a462612b64e97fa7dfe461c32c58553fd6ec63c5
292b0dcaba3b2a5e3f9668d205d39fee2c715721
d55f9abacc4e153d43a4c8bff81a383ba2f311f5
---
## Optional hash table with comma-separated file list
read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
Expand All @@ -21,3 +22,4 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
## 09f75ee426a2e05e0543570821582480ff823ba5: setup-env.sh: if exe contains qemu, use /proc/$$/comm instead
## a462612b64e97fa7dfe461c32c58553fd6ec63c5: fix: allow versions with git attr in packages without git attr
## 292b0dcaba3b2a5e3f9668d205d39fee2c715721: fix: write created time field with OCI buildcache config
## d55f9abacc4e153d43a4c8bff81a383ba2f311f5: views: collapse unique subtrees in symlink case
Loading