Skip to content

Introduce $EESSI_SOFTWARE_LAYER_VERSION_SUFFIX to make build scripts more dynamic #131

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
wants to merge 4 commits into
base: main
Choose a base branch
from
+19 −4
Open

Introduce $EESSI_SOFTWARE_LAYER_VERSION_SUFFIX to make build scripts more dynamic #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dae1ac8
append to EESSI_PREFIX
bedroge Nov 14, 2025
725dbbf
determine and export software layer version suffix
bedroge Nov 14, 2025
000c3ad
check if EESSI_VERSION_OVERRIDE has a suffix
bedroge Nov 14, 2025
7be2161
Merge branch 'main' of github.com:EESSI/software-layer-scripts into s…
bedroge Nov 14, 2025
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
10 changes: 9 additions & 1 deletion init/eessi_defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,15 @@

export EESSI_VERSION_DEFAULT='__EESSI_VERSION_DEFAULT__'

export EESSI_VERSION="${EESSI_VERSION_OVERRIDE:=${EESSI_VERSION_DEFAULT}}"
# if $EESSI_VERSION_OVERRIDE is set and has a suffix, e.g. 2025.06-001,
# we split it into EESSI_VERSION (2025.06) and EESSI_SOFTWARE_LAYER_VERSION_SUFFIX (-001)
if [[ "${EESSI_VERSION_OVERRIDE}" == *-* ]]; then
export EESSI_VERSION=${EESSI_VERSION_OVERRIDE%-*}
export EESSI_SOFTWARE_LAYER_VERSION_SUFFIX="-${EESSI_VERSION_OVERRIDE#*-}"
else
export EESSI_VERSION="${EESSI_VERSION_OVERRIDE:=${EESSI_VERSION_DEFAULT}}"
export EESSI_SOFTWARE_LAYER_VERSION_SUFFIX=""
fi

# use different defaults for RISC-V clients
if [[ $(uname -m) == "riscv64" ]]; then
Expand Down
2 changes: 1 addition & 1 deletion init/minimal_eessi_env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ EESSI_INIT_DIR_PATH=$(dirname $(readlink -f $BASH_SOURCE))
# script takes *_OVERRIDEs into account
source ${EESSI_INIT_DIR_PATH}/eessi_defaults

export EESSI_PREFIX=$EESSI_CVMFS_REPO/versions/$EESSI_VERSION
export EESSI_PREFIX=$EESSI_CVMFS_REPO/versions/${EESSI_VERSION}${EESSI_SOFTWARE_LAYER_VERSION_SUFFIX}

if [[ $(uname -s) == 'Linux' ]]; then
export EESSI_OS_TYPE='linux'
Expand Down
11 changes: 9 additions & 2 deletions init/modules/EESSI/2023.06.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,18 @@ local eessi_repo = "/cvmfs/software.eessi.io"
local eessi_prefix = pathJoin(eessi_repo, "versions", eessi_version)
local eessi_compat_prefix = pathJoin(eessi_prefix, "compat")
local eessi_init_prefix = pathJoin(eessi_prefix, "init")
local eessi_software_layer_version_suffix = ""
local eessi_os_type = "linux"
-- for RISC-V clients we need to do some overrides, as things are stored in different CVMFS repositories
if (subprocess("uname -m"):gsub("\n$","") == "riscv64") then
if (eessi_version == "2023.06" or eessi_version == "20240402") then
eessi_version = os.getenv("EESSI_VERSION_OVERRIDE") or "20240402"
eessi_version_override = os.getenv("EESSI_VERSION_OVERRIDE") or ""
i_suffix = string.find(eessi_version_override, '-')
if i_suffix then
eessi_software_layer_version_suffix = string.sub(eessi_version_override, i_suffix)
end
eessi_repo = "/cvmfs/riscv.eessi.io"
eessi_prefix = pathJoin(eessi_repo, "versions", eessi_version)
eessi_prefix = pathJoin(eessi_repo, "versions", eessi_version .. eessi_software_layer_version_suffix)
eessi_compat_prefix = pathJoin(eessi_prefix, "compat")
if mode() == "load" then
LmodMessage("RISC-V architecture detected, but there is no RISC-V support yet in the production repository.\n" ..
Expand Down Expand Up @@ -139,6 +144,8 @@ prepend_path("PATH", pathJoin(eessi_eprefix, "bin"))
eessiDebug("Adding " .. pathJoin(eessi_eprefix, "bin") .. " to PATH")
prepend_path("PATH", pathJoin(eessi_eprefix, "usr", "bin"))
eessiDebug("Adding " .. pathJoin(eessi_eprefix, "usr", "bin") .. " to PATH")
setenv("EESSI_SOFTWARE_LAYER_VERSION_SUFFIX", eessi_software_layer_version_suffix)
eessiDebug("Setting EESSI_SOFTWARE_LAYER_VERSION_SUFFIX to " .. eessi_software_layer_version_suffix)
setenv("EESSI_SOFTWARE_PATH", eessi_software_path)
eessiDebug("Setting EESSI_SOFTWARE_PATH to " .. eessi_software_path)
setenv("EESSI_MODULEPATH", eessi_module_path)
Expand Down
Loading