From 77920b267a69299af92359f6da2637188c20a357 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 7 Sep 2023 18:20:08 +0200 Subject: [PATCH 1/9] {2023.06}[foss/2021a] GDAL v3.3.0 --- .github/workflows/test_eessi.yml | 1 + eessi-2023.06-eb-4.8.0-2021a.yml | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 eessi-2023.06-eb-4.8.0-2021a.yml diff --git a/.github/workflows/test_eessi.yml b/.github/workflows/test_eessi.yml index 7667d02c26..48c41c7ce0 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-2021a.yml - eessi-2023.06-eb-4.8.0-system.yml steps: - name: Check out software-layer repository diff --git a/eessi-2023.06-eb-4.8.0-2021a.yml b/eessi-2023.06-eb-4.8.0-2021a.yml new file mode 100644 index 0000000000..1adf0572d3 --- /dev/null +++ b/eessi-2023.06-eb-4.8.0-2021a.yml @@ -0,0 +1,2 @@ +easyconfigs: + - GDAL-3.3.0-foss-2021a.eb From a9caba346620846eba20fa31e8944a63ffa5a55b Mon Sep 17 00:00:00 2001 From: lara Date: Fri, 8 Sep 2023 10:19:51 +0200 Subject: [PATCH 2/9] {2023.06}[foss/2021b] OpenFoam v2112 --- eessi-2023.06-eb-4.8.0-2021b.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 eessi-2023.06-eb-4.8.0-2021b.yml diff --git a/eessi-2023.06-eb-4.8.0-2021b.yml b/eessi-2023.06-eb-4.8.0-2021b.yml new file mode 100644 index 0000000000..b2202b5e7d --- /dev/null +++ b/eessi-2023.06-eb-4.8.0-2021b.yml @@ -0,0 +1,2 @@ +easyconfigs: + - OpenFOAM-v2112-foss-2021b.eb From 1df48dcd78e3c166835c4b47bf70a4ee46ec2f5f Mon Sep 17 00:00:00 2001 From: lara Date: Fri, 8 Sep 2023 10:24:45 +0200 Subject: [PATCH 3/9] add new easystack file --- .github/workflows/test_eessi.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test_eessi.yml b/.github/workflows/test_eessi.yml index 7667d02c26..dba7403901 100644 --- a/.github/workflows/test_eessi.yml +++ b/.github/workflows/test_eessi.yml @@ -27,6 +27,7 @@ jobs: - 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-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 From 8c057bc7376d4ce201849262e0fa2a1da65104df Mon Sep 17 00:00:00 2001 From: lara Date: Fri, 8 Sep 2023 12:48:58 +0200 Subject: [PATCH 4/9] include patch for tsprintf.c --- eessi-2023.06-eb-4.8.0-2021b.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/eessi-2023.06-eb-4.8.0-2021b.yml b/eessi-2023.06-eb-4.8.0-2021b.yml index b2202b5e7d..ea32b3acbb 100644 --- a/eessi-2023.06-eb-4.8.0-2021b.yml +++ b/eessi-2023.06-eb-4.8.0-2021b.yml @@ -1,2 +1,6 @@ easyconfigs: - - OpenFOAM-v2112-foss-2021b.eb + - OpenFOAM-v2112-foss-2021b.eb: + #fix for different output of tsprintf.c test from GNU C library <2.36 + #see https://github.com/easybuilders/easybuild-easyconfigs/pull/18746 + options: + from-pr: 18746 From 39eda7ba930570afef702cc834632b99422cd403 Mon Sep 17 00:00:00 2001 From: lara Date: Fri, 8 Sep 2023 13:12:32 +0200 Subject: [PATCH 5/9] include patch for tsprintf.c --- eessi-2023.06-eb-4.8.0-2021b.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eessi-2023.06-eb-4.8.0-2021b.yml b/eessi-2023.06-eb-4.8.0-2021b.yml index ea32b3acbb..ff15917797 100644 --- a/eessi-2023.06-eb-4.8.0-2021b.yml +++ b/eessi-2023.06-eb-4.8.0-2021b.yml @@ -1,6 +1,7 @@ easyconfigs: - - OpenFOAM-v2112-foss-2021b.eb: + - MPFR-4.1.0-GCCcore-11.2.0.eb: #fix for different output of tsprintf.c test from GNU C library <2.36 #see https://github.com/easybuilders/easybuild-easyconfigs/pull/18746 options: from-pr: 18746 + - OpenFOAM-v2112-foss-2021b.eb From e0fe6b5c26cd9eb0442ffa5a0496d9d422f04090 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 9 Sep 2023 12:29:40 +0200 Subject: [PATCH 6/9] improve comment for use of --from-pr for MPFR 4.1.0 --- eessi-2023.06-eb-4.8.0-2021b.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eessi-2023.06-eb-4.8.0-2021b.yml b/eessi-2023.06-eb-4.8.0-2021b.yml index ff15917797..477ba6320c 100644 --- a/eessi-2023.06-eb-4.8.0-2021b.yml +++ b/eessi-2023.06-eb-4.8.0-2021b.yml @@ -1,7 +1,7 @@ easyconfigs: - MPFR-4.1.0-GCCcore-11.2.0.eb: - #fix for different output of tsprintf.c test from GNU C library <2.36 - #see https://github.com/easybuilders/easybuild-easyconfigs/pull/18746 + # use patch for MPFR 4.1.0 to fix failing tsprintf test with glibc >= 2.37, + # see https://github.com/easybuilders/easybuild-easyconfigs/pull/18746 options: from-pr: 18746 - OpenFOAM-v2112-foss-2021b.eb From 6317155e0afa3a85b678571ea7c8e2187e85ff5b Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 12 Sep 2023 14:44:28 +0200 Subject: [PATCH 7/9] {2023.06} EasyBuild v4.8.1 --- eessi-2023.06-eb-4.8.0-system.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eessi-2023.06-eb-4.8.0-system.yml b/eessi-2023.06-eb-4.8.0-system.yml index 744a52bde6..2928f110b0 100644 --- a/eessi-2023.06-eb-4.8.0-system.yml +++ b/eessi-2023.06-eb-4.8.0-system.yml @@ -5,3 +5,6 @@ easyconfigs: # + https://github.com/easybuilders/easybuild-easyblocks/pull/2995 options: include-easyblocks-from-pr: 2995 + - EasyBuild-4.8.1.eb: + options: + from-pr: 18761 From 26f6c02d6075e1079e49afe73947c0ed2e2cd5fa Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 13 Sep 2023 11:05:47 +0200 Subject: [PATCH 8/9] trigger rebuild of Java/11 with EasyBuild v4.8.1 --- .github/workflows/test_eessi.yml | 1 + EESSI-pilot-install-software.sh | 2 +- eessi-2023.06-eb-4.8.1-system.yml | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 eessi-2023.06-eb-4.8.1-system.yml diff --git a/.github/workflows/test_eessi.yml b/.github/workflows/test_eessi.yml index da1379043a..2db4809b21 100644 --- a/.github/workflows/test_eessi.yml +++ b/.github/workflows/test_eessi.yml @@ -29,6 +29,7 @@ jobs: - eessi-2023.06-eb-4.8.0-2021a.yml - eessi-2023.06-eb-4.8.0-system.yml - eessi-2023.06-eb-4.8.0-2021b.yml + - eessi-2023.06-eb-4.8.1-system.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 29fbb7aa62..4605b77873 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' '4.8.0'; do +for eb_version in '4.7.2' '4.8.0' '4.8.1'; do # load EasyBuild module (will be installed if it's not available yet) source ${TOPDIR}/load_easybuild_module.sh ${eb_version} diff --git a/eessi-2023.06-eb-4.8.1-system.yml b/eessi-2023.06-eb-4.8.1-system.yml new file mode 100644 index 0000000000..bab3755330 --- /dev/null +++ b/eessi-2023.06-eb-4.8.1-system.yml @@ -0,0 +1,4 @@ +easyconfigs: + - Java-11.eb: + options: + rebuild: True From ea318e635ff1e6f9b8c6dc4f26003ab3bd5f720e Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Wed, 13 Sep 2023 14:38:44 +0200 Subject: [PATCH 9/9] remove 'rebuild' option for Java/11 with EasyBuild v4.8.1 --- eessi-2023.06-eb-4.8.1-system.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/eessi-2023.06-eb-4.8.1-system.yml b/eessi-2023.06-eb-4.8.1-system.yml index bab3755330..8966fbfb7a 100644 --- a/eessi-2023.06-eb-4.8.1-system.yml +++ b/eessi-2023.06-eb-4.8.1-system.yml @@ -1,4 +1,3 @@ easyconfigs: - - Java-11.eb: - options: - rebuild: True + # rebuilt with EasyBuild v4.8.1 (now wraps around Java/11.0.20) + - Java-11.eb