Skip to content

make sure that EESSI version for which build is triggered matches with location of easystack file + fix URL in create_directory_tarballs.sh #7

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

Merged
ocaisa merged 2 commits into from
Jun 13, 2025
Merged

make sure that EESSI version for which build is triggered matches with location of easystack file + fix URL in create_directory_tarballs.sh #7

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
e5446be
make sure that EESSI version for which build is triggered matches wit…
boegel Jun 13, 2025
19efe9e
fix URL used in create_directory_tarballs.sh, should be EESSI/softwar…
boegel Jun 13, 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
6 changes: 6 additions & 0 deletions EESSI-install-software.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,12 @@ else
new_easystacks=$(echo "${changed_easystacks}" | (grep -v "/rebuilds/" || true))
for easystack_file in ${rebuild_easystacks} ${new_easystacks}; do

# make sure that easystack file being picked up is for EESSI version that we're building for...
echo "${easystack_file}" | grep -q "^easystacks/${EESSI_VERSION}/"
Copy link
Member

@ocaisa ocaisa Jun 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Damn, this is wrong: easystacks/software.eessi.io/2023.06

Copy link
Contributor Author

@boegel boegel Jun 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah snap, I should've been more careful here... :|

Copy link
Contributor Author

@boegel boegel Jun 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed in #8

if [ $? -ne 0 ]; then
fatal_error "Easystack file ${easystack_file} is not intended for EESSI version ${EESSI_VERSION}, giving up!"
fi

echo -e "Processing easystack file ${easystack_file}...\n\n"

# determine version of EasyBuild module to load based on EasyBuild version included in name of easystack file
Expand Down
6 changes: 3 additions & 3 deletions create_directory_tarballs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ fi

version=$1

SOFTWARE_LAYER_TARBALL_URL="https://github.com/EESSI/software-layer/tarball/${version}-software.eessi.io"
SOFTWARE_LAYER_SCRIPTS_TARBALL_URL="https://github.com/EESSI/software-layer-scripts/tarball/main"

TOPDIR=$(dirname $(realpath $0))

Expand All @@ -26,7 +26,7 @@ fi
tartmp=$(mktemp -t -d init.XXXXX)
mkdir "${tartmp}/${version}"
tarname="eessi-${version}-init-$(date +%s).tar.gz"
curl -Ls ${SOFTWARE_LAYER_TARBALL_URL} | tar xzf - -C "${tartmp}/${version}" --strip-components=1 --no-wildcards-match-slash --wildcards '*/init/'
curl -Ls ${SOFTWARE_LAYER_SCRIPTS_TARBALL_URL} | tar xzf - -C "${tartmp}/${version}" --strip-components=1 --no-wildcards-match-slash --wildcards '*/init/'
source "${tartmp}/${version}/init/minimal_eessi_env"
if [ "${EESSI_VERSION}" != "${version}" ]
then
Expand All @@ -42,7 +42,7 @@ echo_green "Done! Created tarball ${tarname}."
tartmp=$(mktemp -t -d scripts.XXXXX)
mkdir "${tartmp}/${version}"
tarname="eessi-${version}-scripts-$(date +%s).tar.gz"
curl -Ls ${SOFTWARE_LAYER_TARBALL_URL} | tar xzf - -C "${tartmp}/${version}" --strip-components=1 --no-wildcards-match-slash --wildcards '*/scripts/'
curl -Ls ${SOFTWARE_LAYER_SCRIPTS_TARBALL_URL} | tar xzf - -C "${tartmp}/${version}" --strip-components=1 --no-wildcards-match-slash --wildcards '*/scripts/'
tar czf "${tarname}" -C "${tartmp}" "${version}"
rm -rf "${tartmp}"

Expand Down