Skip to content

fix(eessi-extend): the current EESSI, the compat layer from EESSI_EPREFIX, and a named user prefix created - #27

Merged
HaoZeke merged 4 commits into
mainfrom
fix/eessi-extend-eb
Nov 16, 2026
Merged

HaoZeke merged 4 commits into
mainfrom
fix/eessi-extend-eb

Conversation

@HaoZeke

@HaoZeke HaoZeke commented Nov 15, 2026

Copy link
Copy Markdown
Collaborator

scripts/eessi-extend-eb.sh had three problems:

  • It defaulted to EESSI 2025.06, while the docs and the CLI's --eessi-version default to 2026.06.
  • It put the compatibility layer's ld on PATH only when EESSI_VERSION was set, so a run on the default version went without it.
  • It created the user prefix only when no prefix was set at all. A named EESSI_USER_INSTALL that did not exist yet made EESSI-extend refuse to load.

Changes:

  • default 2026.06; the repository from EESSI_CVMFS_REPO (default /cvmfs/software.eessi.io), so a mirror or another EESSI repository works;
  • the compatibility layer from the EESSI_EPREFIX that the init sets, falling back to the path built from the version;
  • two prefixes are refused before anything is created; any user prefix is created, a project or site prefix never, since those need an owner's group and modes;
  • eessi_cargo_host_isolation() takes the layer from EESSI_EPREFIX the same way, and examples/targets/eessi-extend.toml names 2026.06.

Tests: new tests/eessi_extend_eb_script.rs (7 tests) runs the script against a fake repository whose init defines module and whose eb prints its environment. cargo test --lib 933 passed; --test pypi_cran_extend 22 and --test target_config 13 passed. cargo fmt --check, clippy on the new test with -D warnings, and shellcheck pass. towncrier build --draft renders the fragment.

Merge #26 first; this adds a fragment to its changelog.d/.

Release notes went into CHANGELOG.md by hand, so any two pull
requests that touch it conflict. The other stackhands repositories
take one fragment per change in changelog.d/ and build the section at
release with towncrier.

towncrier.toml follows theirs, with this changelog's heading and
section names. A workflow drafts the changelog on each pull request,
with the version from Cargo.toml, and checks that a misnamed fragment
fails. CONTRIBUTING asks for a fragment and puts towncrier build in the
release steps.
…EFIX, and a named user prefix created

eessi-extend-eb.sh defaulted to EESSI 2025.06 while the docs and the
CLI default to 2026.06. It put the compatibility layer's ld on PATH
only when EESSI_VERSION was set, so the default version ran without
it. It created the user prefix only when no prefix was set, so a
named EESSI_USER_INSTALL that did not exist yet made EESSI-extend
refuse to load.

The script now defaults to 2026.06, reads the repository from
EESSI_CVMFS_REPO, and takes the compatibility layer from the
EESSI_EPREFIX that the init sets, falling back to the path built from
the version. It refuses two prefixes before creating anything and
creates any user prefix, never a project or site one. The Cargo
prelude takes the layer from EESSI_EPREFIX the same way, and the
example target names 2026.06.

tests/eessi_extend_eb_script.rs runs the script against a fake
repository whose init defines module and whose eb prints its
environment.
A missing rustc failed the wrapper under pipefail before EasyBuild ran, and
CI never executed the new script test. The Cargo prelude follows
EESSI_CVMFS_REPO when EESSI_EPREFIX is unset.
…mpty

EESSI-extend treats a prefix variable as set when it is present, including
an empty value. The wrapper counted only non-empty values, so an empty
EESSI_SITE_INSTALL also exported EESSI_USER_INSTALL and the module refused
the combination.
@HaoZeke
HaoZeke merged commit 94bb9bb into main Nov 16, 2026
22 checks passed
@HaoZeke
HaoZeke deleted the fix/eessi-extend-eb branch November 16, 2026 04:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant