From 69d4c019558f8748b5a56f3b0ace7a5a94109eef Mon Sep 17 00:00:00 2001 From: lara Date: Wed, 6 Sep 2023 11:13:57 +0200 Subject: [PATCH 1/7] {2023.06}[SYSTEM] Java v11.0.18 --- .github/workflows/test_eessi.yml | 1 + EESSI-pilot-install-software.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_eessi.yml b/.github/workflows/test_eessi.yml index 65994cab2d..c51d313490 100644 --- a/.github/workflows/test_eessi.yml +++ b/.github/workflows/test_eessi.yml @@ -26,6 +26,7 @@ jobs: - eessi-2023.06-eb-4.7.2-2022a.yml - eessi-2023.06-eb-4.7.2-2022b.yml - eessi-2023.06-eb-4.7.2-system.yml + - eessi-2023.06-eb-4.8.0-2021b.yml steps: - name: Check out software-layer repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0 diff --git a/EESSI-pilot-install-software.sh b/EESSI-pilot-install-software.sh index 8110135cc0..29fbb7aa62 100755 --- a/EESSI-pilot-install-software.sh +++ b/EESSI-pilot-install-software.sh @@ -172,7 +172,7 @@ else echo_green ">> MODULEPATH set up: ${MODULEPATH}" fi -for eb_version in '4.7.2'; do +for eb_version in '4.7.2' '4.8.0'; do # load EasyBuild module (will be installed if it's not available yet) source ${TOPDIR}/load_easybuild_module.sh ${eb_version} From 41ed8d8485ca018b1657605677e148713efe15a8 Mon Sep 17 00:00:00 2001 From: lara Date: Wed, 6 Sep 2023 11:16:30 +0200 Subject: [PATCH 2/7] add Java --- eessi-2023.06-eb-4.8.0-system.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 eessi-2023.06-eb-4.8.0-system.yml diff --git a/eessi-2023.06-eb-4.8.0-system.yml b/eessi-2023.06-eb-4.8.0-system.yml new file mode 100644 index 0000000000..ebd7435eea --- /dev/null +++ b/eessi-2023.06-eb-4.8.0-system.yml @@ -0,0 +1,6 @@ +easyconfigs: + - Java-11.0.18.eb: + # see https://github.com/easybuilders/easybuild-easyblocks/pull/2557 + options: + include-easyblocks-from-pr: 2557 +~ From c0a3f109d03a2a15bc75bf1143ec77dc63dbd5ba Mon Sep 17 00:00:00 2001 From: lara Date: Wed, 6 Sep 2023 11:18:17 +0200 Subject: [PATCH 3/7] update eessi-2023.06-eb-4.8.0-system.yml --- eessi-2023.06-eb-4.8.0-system.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/eessi-2023.06-eb-4.8.0-system.yml b/eessi-2023.06-eb-4.8.0-system.yml index ebd7435eea..2cce43b80b 100644 --- a/eessi-2023.06-eb-4.8.0-system.yml +++ b/eessi-2023.06-eb-4.8.0-system.yml @@ -3,4 +3,3 @@ easyconfigs: # see https://github.com/easybuilders/easybuild-easyblocks/pull/2557 options: include-easyblocks-from-pr: 2557 -~ From c3ce1cb2633f24b8c0d21787d5e8a927ca5dc9e7 Mon Sep 17 00:00:00 2001 From: lara Date: Wed, 6 Sep 2023 11:28:30 +0200 Subject: [PATCH 4/7] add right easystack-file --- .github/workflows/test_eessi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_eessi.yml b/.github/workflows/test_eessi.yml index c51d313490..7667d02c26 100644 --- a/.github/workflows/test_eessi.yml +++ b/.github/workflows/test_eessi.yml @@ -26,7 +26,7 @@ jobs: - eessi-2023.06-eb-4.7.2-2022a.yml - eessi-2023.06-eb-4.7.2-2022b.yml - eessi-2023.06-eb-4.7.2-system.yml - - eessi-2023.06-eb-4.8.0-2021b.yml + - eessi-2023.06-eb-4.8.0-system.yml steps: - name: Check out software-layer repository uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0 From 95370cdfcea6246438e0bace7a2d267707114500 Mon Sep 17 00:00:00 2001 From: lara Date: Wed, 6 Sep 2023 13:01:57 +0200 Subject: [PATCH 5/7] change Java --- eessi-2023.06-eb-4.8.0-system.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eessi-2023.06-eb-4.8.0-system.yml b/eessi-2023.06-eb-4.8.0-system.yml index 2cce43b80b..6da9c66483 100644 --- a/eessi-2023.06-eb-4.8.0-system.yml +++ b/eessi-2023.06-eb-4.8.0-system.yml @@ -1,5 +1,5 @@ easyconfigs: - - Java-11.0.18.eb: + - Java-11.eb: # see https://github.com/easybuilders/easybuild-easyblocks/pull/2557 options: include-easyblocks-from-pr: 2557 From 190cb999eb7c166f32b9411fe37ab13b53117721 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 6 Sep 2023 17:40:50 +0200 Subject: [PATCH 6/7] use more recent easyblock PR to fix Java/11 installation --- eessi-2023.06-eb-4.8.0-system.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eessi-2023.06-eb-4.8.0-system.yml b/eessi-2023.06-eb-4.8.0-system.yml index 6da9c66483..744a52bde6 100644 --- a/eessi-2023.06-eb-4.8.0-system.yml +++ b/eessi-2023.06-eb-4.8.0-system.yml @@ -1,5 +1,7 @@ easyconfigs: - Java-11.eb: + # patch Java binaries/libraries when using alternate sysroot to ensure correct glibc & co are picked up # see https://github.com/easybuilders/easybuild-easyblocks/pull/2557 + # + https://github.com/easybuilders/easybuild-easyblocks/pull/2995 options: - include-easyblocks-from-pr: 2557 + include-easyblocks-from-pr: 2995 From 25f21696dc4b2cab3ba865bc57bec0b1b24f6bb9 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 6 Sep 2023 21:29:44 +0200 Subject: [PATCH 7/7] filter out .modulerc.lua (for Java) in create_tarball.sh since there's no corresponding directory under software/ --- create_tarball.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/create_tarball.sh b/create_tarball.sh index b6c72b341d..65f6efc2dc 100755 --- a/create_tarball.sh +++ b/create_tarball.sh @@ -52,7 +52,7 @@ if [ -d ${pilot_version}/software/${os}/${cpu_arch_subdir}/modules ]; then find ${pilot_version}/software/${os}/${cpu_arch_subdir}/modules -type l | grep -v '/\.wh\.' >> ${files_list} # module files and symlinks find ${pilot_version}/software/${os}/${cpu_arch_subdir}/modules/all -type f -o -type l \ - | grep -v '/\.wh\.' | sed -e 's/.lua$//' | sed -e 's@.*/modules/all/@@g' | sort -u \ + | grep -v '/\.wh\.' | grep -v '/\.modulerc\.lua' | sed -e 's/.lua$//' | sed -e 's@.*/modules/all/@@g' | sort -u \ >> ${module_files_list} fi if [ -d ${pilot_version}/software/${os}/${cpu_arch_subdir}/software -a -r ${module_files_list} ]; then