Skip to content

Commit 39e8e40

Browse files
committed
add EESSI/2025.06 module file
1 parent 8eb99ad commit 39e8e40

File tree

4 files changed

+18
-2
lines changed

4 files changed

+18
-2
lines changed

EESSI-install-software.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ export PR_DIFF="$PWD/$pr_diff"
249249

250250
# Only run install_scripts.sh if not in dev.eessi.io for security
251251
if [[ -z ${EESSI_DEV_PROJECT} ]]; then
252-
${TOPDIR}/install_scripts.sh --prefix ${EESSI_PREFIX}
252+
${TOPDIR}/install_scripts.sh --prefix ${EESSI_PREFIX} --eessi-version ${EESSI_VERSION}
253253
fi
254254

255255
echo ">> Configuring EasyBuild..."

init/modules/EESSI/2023.06.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ More information
1010
whatis("Description: The European Environment for Scientific Software Installations (EESSI, pronounced as easy) is a collaboration between different European partners in HPC community. The goal of this project is to build a common stack of scientific software installations for HPC systems and beyond, including laptops, personal workstations and cloud infrastructure.")
1111
whatis("URL: https://www.eessi.io/docs/")
1212
conflict("EESSI")
13+
-- this is a version-agnostic module file, works for EESSI/2023.06, EESSI/2025.06, etc.
1314
local eessi_version = myModuleVersion()
1415
local eessi_repo = "/cvmfs/software.eessi.io"
1516
if (subprocess("uname -m"):gsub("\n$","") == "riscv64") then

init/modules/EESSI/2025.06.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2023.06.lua

install_scripts.sh

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,10 @@ POSITIONAL_ARGS=()
100100

101101
while [[ $# -gt 0 ]]; do
102102
case $1 in
103+
--eessi-version)
104+
EESSI_VERSION="$2"
105+
shift 2
106+
;;
103107
-p|--prefix)
104108
INSTALL_PREFIX="$2"
105109
shift 2
@@ -120,6 +124,16 @@ while [[ $# -gt 0 ]]; do
120124
esac
121125
done
122126

127+
if [ -z "${INSTALL_PREFIX}" ]; then
128+
echo "EESSI prefix not specified, you must use --prefix" >&2
129+
exit 2
130+
fi
131+
132+
if [ -z "${EESSI_VERSION}" ]; then
133+
echo "EESSI version not specified, you must use --eessi-version" >&2
134+
exit 3
135+
fi
136+
123137
set -- "${POSITIONAL_ARGS[@]}"
124138

125139
TOPDIR=$(dirname $(realpath $0))
@@ -146,7 +160,7 @@ copy_files_by_list ${TOPDIR}/init/Magic_Castle ${INSTALL_PREFIX}/init/Magic_Cast
146160

147161
# Copy for init/modules/EESSI directory
148162
mc_files=(
149-
2023.06.lua
163+
${EESSI_VERSION}.lua
150164
)
151165
copy_files_by_list ${TOPDIR}/init/modules/EESSI ${INSTALL_PREFIX}/init/modules/EESSI "${mc_files[@]}"
152166

0 commit comments

Comments
 (0)