Skip to content
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

Allow EESSI-extend as a loaded module when using EasyBuild #578

Merged
merged 5 commits into from
Jun 7, 2024
Merged

Allow EESSI-extend as a loaded module when using EasyBuild #578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6cf6335
Allow EESSI-extend as a loaded module when using EasyBuild
ocaisa May 15, 2024
fbdb846
Rebuild the module
ocaisa May 15, 2024
f044b1a
Merge branch '2023.06-software.eessi.io' into allow_loaded_eessi_extend
ocaisa May 16, 2024
46d9018
Apply suggestions from code review
ocaisa Jun 7, 2024
51118ef
remove double hyphen in filename
bedroge Jun 7, 2024
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: 8 additions & 2 deletions EESSI-extend-2023.06-easybuild.eb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,17 @@ setenv ("EASYBUILD_SYSROOT", sysroot)
setenv ("EASYBUILD_PREFIX", pathJoin(working_dir, "easybuild"))
setenv ("EASYBUILD_INSTALLPATH", easybuild_installpath)
setenv ("EASYBUILD_HOOKS", pathJoin(os.getenv("EESSI_PREFIX"), "init", "easybuild", "eb_hooks.py"))
setenv ("EASYBUILD_UMASK", "002")

-- Make sure to use the general umask that allows a global read
setenv ("EASYBUILD_UMASK", "022")

-- Allow this module to be loaded when running EasyBuild
setenv ("EASYBUILD_ALLOW_LOADED_MODULES", "EasyBuild,EESSI-extend")

-- Set all related environment variables if we have project or user installations (including extending MODULEPATH)
if (user_modulepath ~= nil) then
-- Use a more restrictive umask for this case
setenv ("EASYBUILD_UMASK", "022")
setenv ("EASYBUILD_UMASK", "077")
setenv ("EASYBUILD_STICKY_BIT", "1")
-- configure MODULEPATH
if (project_modulepath ~= nil) then
Expand All @@ -155,6 +160,7 @@ elseif (project_modulepath ~= nil) then
setenv ("EASYBUILD_SET_GID_BIT", "1")
setenv ("EASYBUILD_GROUP_WRITABLE_INSTALLDIR", "1")
setenv ("EASYBUILD_STICKY_BIT", "0")
setenv ("EASYBUILD_UMASK", "002")
-- configure MODULEPATH
prepend_path("MODULEPATH", project_modulepath)
end
Expand Down
5 changes: 5 additions & 0 deletions ...stacks/software.eessi.io/2023.06/rebuilds/20240506-eb-4.9.1-EESSI-extend-allow-loaded.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# 2024.05.15
# The module is an EasyBuild created module and therefore needs to be an allowed
# module when running EasyBuild
easyconfigs:
- EESSI-extend-2023.06-easybuild.eb