From ae924e0c589d546651725abf87dc59877cfb3bfb Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 7 May 2024 15:21:29 +0200 Subject: [PATCH 1/7] {2023.06}[foss/2023a] OpenFOAM v2312 --- .../software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml index e65747e4a5..674cc49a39 100644 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml @@ -4,3 +4,4 @@ easyconfigs: - R-bundle-Bioconductor-3.18-foss-2023a-R-4.3.2.eb: options: from-pr: 20379 + - OpenFOAM-v2312-foss-2023a.eb From 408417394078072338bb13bce6d226cf08ebec7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 7 Jun 2024 14:19:29 +0200 Subject: [PATCH 2/7] use PRs with fixes for easyconfig+easyblock Co-authored-by: ocaisa --- .../software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml index 674cc49a39..5ca2d7d3ec 100644 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml @@ -5,3 +5,6 @@ easyconfigs: options: from-pr: 20379 - OpenFOAM-v2312-foss-2023a.eb + options: + include-easyblocks-from-pr: 3328 + from-pr: 20517 From 958e78ac5f03af4faccf59caa5f18c2544f20da4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Fri, 7 Jun 2024 14:27:38 +0200 Subject: [PATCH 3/7] add missing colon --- .../software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml index cb7ee4ab27..c9334c2acf 100644 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml @@ -17,7 +17,7 @@ easyconfigs: from-pr: 20595 - GATK-4.5.0.0-GCCcore-12.3.0-Java-17.eb - WhatsHap-2.2-foss-2023a.eb - - OpenFOAM-v2312-foss-2023a.eb + - OpenFOAM-v2312-foss-2023a.eb: options: include-easyblocks-from-pr: 3328 from-pr: 20517 From 59ad3f572148b5e862ee415df37463cb9a91e646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Mon, 17 Jun 2024 22:40:47 +0200 Subject: [PATCH 4/7] use new PRs for OpenFOAM --- .../2023.06/eessi-2023.06-eb-4.9.1-2023a.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml index f62267a0a3..4c3a0a5bd1 100644 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml @@ -24,5 +24,5 @@ easyconfigs: - OrthoFinder-2.5.5-foss-2023a.eb - OpenFOAM-v2312-foss-2023a.eb: options: - include-easyblocks-from-pr: 3328 - from-pr: 20517 + include-easyblocks-from-pr: 3366 + from-pr: 20841 From 3af05e91a6289502978b53222abba74ce6a88b6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 18 Jun 2024 10:26:19 +0200 Subject: [PATCH 5/7] move OpenFOAM to EB 4.9.2 easystack --- .../2023.06/eessi-2023.06-eb-4.9.1-2023a.yml | 4 ---- .../2023.06/eessi-2023.06-eb-4.9.2-2023a.yml | 6 ++++++ 2 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml index 4c3a0a5bd1..27c18a487e 100644 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.1-2023a.yml @@ -22,7 +22,3 @@ easyconfigs: from-pr: 20784 - Valgrind-3.21.0-gompi-2023a.eb - OrthoFinder-2.5.5-foss-2023a.eb - - OpenFOAM-v2312-foss-2023a.eb: - options: - include-easyblocks-from-pr: 3366 - from-pr: 20841 diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml new file mode 100644 index 0000000000..eb1169918f --- /dev/null +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml @@ -0,0 +1,6 @@ +easyconfigs: + - OpenFOAM-v2312-foss-2023a.eb: + options: + include-easyblocks-from-pr: 3366 + from-pr: 20841 + From 76c963f63ad8100fd87424e15be926bcdcb91d42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Wed, 19 Jun 2024 12:02:00 +0200 Subject: [PATCH 6/7] use from-commit instead of from-pr --- .../2023.06/eessi-2023.06-eb-4.9.2-2023a.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml index eb1169918f..74e1f4610b 100644 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml @@ -1,6 +1,7 @@ easyconfigs: - OpenFOAM-v2312-foss-2023a.eb: options: - include-easyblocks-from-pr: 3366 - from-pr: 20841 - + # https://github.com/easybuilders/easybuild-easyblocks/pull/3366 + include-easyblocks-from-commit: d1f2231b2de4f8548c75c7367456873a8c33b5f9 + # https://github.com/easybuilders/easybuild-easyconfigs/pull/20841 + from-commit: f0e91e6e430ebf902f7788ebb47f0203dee60649 From 391d5eda743660471b7bcb6aa4df6df0229052e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Tue, 9 Jul 2024 15:47:14 +0200 Subject: [PATCH 7/7] use easyblock from PR 3388 --- .../2023.06/eessi-2023.06-eb-4.9.2-2023a.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml index 74e1f4610b..05e86a8565 100644 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.2-2023a.yml @@ -1,7 +1,7 @@ easyconfigs: - OpenFOAM-v2312-foss-2023a.eb: options: - # https://github.com/easybuilders/easybuild-easyblocks/pull/3366 - include-easyblocks-from-commit: d1f2231b2de4f8548c75c7367456873a8c33b5f9 + # https://github.com/easybuilders/easybuild-easyblocks/pull/3388 + include-easyblocks-from-commit: c8256a36e7062bc09f5ce30552a9de9827054c9e # https://github.com/easybuilders/easybuild-easyconfigs/pull/20841 from-commit: f0e91e6e430ebf902f7788ebb47f0203dee60649