Skip to content

Fix tarball naming for CPU-only tarballs #65

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

Closed
wants to merge 2 commits into from
Closed

Fix tarball naming for CPU-only tarballs #65

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
cebf53e
Fix tarball naming for CPU-only tarballs
Aug 19, 2025
f85e74e
Add dummy change to prove functionality of the code
Aug 19, 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: 5 additions & 1 deletion bot/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,11 @@ source $software_layer_dir/init/eessi_defaults
# append the project (subdirectory) name to the end tarball name. This is information
# then used at the ingestion stage. If ${EESSI_DEV_PROJECT} is not defined, nothing is
# appended
export TGZ=$(printf "eessi-%s-software-%s-%s-%s-%b%d.tar.gz" ${EESSI_VERSION} ${EESSI_OS_TYPE} ${EESSI_SOFTWARE_SUBDIR_OVERRIDE//\//-} ${EESSI_ACCELERATOR_TARGET_OVERRIDE//\//-} ${EESSI_DEV_PROJECT:+$EESSI_DEV_PROJECT-} ${timestamp})
if [[ -z ${EESSI_ACCELERATOR_TARGET_OVERRIDE} ]];
export TGZ=$(printf "eessi-%s-software-%s-%s-%b%d.tar.gz" ${EESSI_VERSION} ${EESSI_OS_TYPE} ${EESSI_SOFTWARE_SUBDIR_OVERRIDE//\//-} ${EESSI_DEV_PROJECT:+$EESSI_DEV_PROJECT-} ${timestamp})
else
export TGZ=$(printf "eessi-%s-software-%s-%s-%s-%b%d.tar.gz" ${EESSI_VERSION} ${EESSI_OS_TYPE} ${EESSI_SOFTWARE_SUBDIR_OVERRIDE//\//-} ${EESSI_ACCELERATOR_TARGET_OVERRIDE//\//-} ${EESSI_DEV_PROJECT:+$EESSI_DEV_PROJECT-} ${timestamp})
fi

# Export EESSI_DEV_PROJECT to use it (if needed) when making tarball
echo "bot/build.sh: EESSI_DEV_PROJECT='${EESSI_DEV_PROJECT}'"
Expand Down
9 changes: 5 additions & 4 deletions eb_hooks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Hooks to customize how EasyBuild installs software in EESSI
# see https://docs.easybuild.io/en/latest/Hooks.html
# DUMMY CHANGE, DONT MERGE
import ast
import datetime
import glob
Expand Down Expand Up @@ -151,7 +152,7 @@ def parse_list_of_dicts_env(var_name):
if not re.match(r'^[A-Za-z_][A-Za-z0-9_]*$', var_name):
raise ValueError(f"Invalid environment variable name: {var_name}")
list_string = os.getenv(var_name, '[]')

Copy link
Contributor

Choose a reason for hiding this comment

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

I guess this is just so there's something to include in generated tarball?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, remove any changes to eb_hooks.py after testing...

Also, this removal of whitespace is some vim feature that @smoors recommended to me, I think XD

Copy link
Contributor Author

Choose a reason for hiding this comment

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

(there's a reason I opened the PR in draft mode ;-) I'll put it on ready to review after removing this)

list_of_dicts = []
try:
# Try JSON format first
Expand All @@ -162,7 +163,7 @@ def parse_list_of_dicts_env(var_name):
list_of_dicts = ast.literal_eval(list_string)
except (ValueError, SyntaxError):
raise ValueError(f"Environment variable '{var_name}' does not contain a valid list of dictionaries.")

return list_of_dicts


Expand Down Expand Up @@ -211,7 +212,7 @@ def post_ready_hook(self, *args, **kwargs):
parallel = self.parallel
else:
parallel = self.cfg['parallel']

if parallel == 1:
return # no need to limit if already using 1 core

Expand Down Expand Up @@ -733,7 +734,7 @@ def pre_configure_hook_score_p(self, *args, **kwargs):
def pre_configure_hook_vsearch(self, *args, **kwargs):
"""
Pre-configure hook for VSEARCH
- Workaround for a Zlib macro being renamed in Gentoo, see https://bugs.gentoo.org/383179
- Workaround for a Zlib macro being renamed in Gentoo, see https://bugs.gentoo.org/383179
(solves "expected initializer before 'OF'" errors)
"""
if self.name == 'VSEARCH':
Expand Down
Loading