From e50888450cc398a5867c26e6c4e66249c9dccc30 Mon Sep 17 00:00:00 2001 From: Caspar van Leeuwen Date: Wed, 2 Jul 2025 13:59:18 +0200 Subject: [PATCH 01/19] Add pmt as test --- .../accel/nvidia/zen4_h100/eessi-2023.06-eb-4.9.4-2023a-CUDA.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/easystacks/software.eessi.io/2023.06/accel/nvidia/zen4_h100/eessi-2023.06-eb-4.9.4-2023a-CUDA.yml b/easystacks/software.eessi.io/2023.06/accel/nvidia/zen4_h100/eessi-2023.06-eb-4.9.4-2023a-CUDA.yml index 60d82d46ad..a80a49035e 100644 --- a/easystacks/software.eessi.io/2023.06/accel/nvidia/zen4_h100/eessi-2023.06-eb-4.9.4-2023a-CUDA.yml +++ b/easystacks/software.eessi.io/2023.06/accel/nvidia/zen4_h100/eessi-2023.06-eb-4.9.4-2023a-CUDA.yml @@ -2,3 +2,4 @@ easyconfigs: - CUDA-12.1.1.eb: options: accept-eula-for: CUDA + - pmt-1.2.0-GCCcore-12.3.0-CUDA-12.1.1.eb: From ffe79b42699bb483263d477035050f38000a66c4 Mon Sep 17 00:00:00 2001 From: Caspar van Leeuwen Date: Tue, 8 Jul 2025 16:49:39 +0200 Subject: [PATCH 02/19] Testing Alan's feature branch for software layer scripts --- bot/build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bot/build.sh b/bot/build.sh index d72ecbdd0c..7f136b4b63 100755 --- a/bot/build.sh +++ b/bot/build.sh @@ -3,7 +3,9 @@ # give up as soon as any error occurs set -e -git clone https://github.com/EESSI/software-layer-scripts +#git clone https://github.com/EESSI/software-layer-scripts +# Testing Alan's feature branch +git clone --branch remove_configure_easybuild git@github.com:ocaisa/software-layer-scripts.git # symlink everything, except for: # - common files like LICENSE and README.md From 54819b83ff71e7116e3d9efdc41aa775f1d53a93 Mon Sep 17 00:00:00 2001 From: Caspar van Leeuwen Date: Wed, 9 Jul 2025 11:55:24 +0200 Subject: [PATCH 03/19] Restore original bot/build.sh --- bot/build.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bot/build.sh b/bot/build.sh index 7f136b4b63..d72ecbdd0c 100755 --- a/bot/build.sh +++ b/bot/build.sh @@ -3,9 +3,7 @@ # give up as soon as any error occurs set -e -#git clone https://github.com/EESSI/software-layer-scripts -# Testing Alan's feature branch -git clone --branch remove_configure_easybuild git@github.com:ocaisa/software-layer-scripts.git +git clone https://github.com/EESSI/software-layer-scripts # symlink everything, except for: # - common files like LICENSE and README.md From 1c6c33c8be6ff0b64acb6c7a786d8f3766072bfb Mon Sep 17 00:00:00 2001 From: Caspar van Leeuwen Date: Thu, 10 Jul 2025 13:01:19 +0200 Subject: [PATCH 04/19] Use PR #36 to test if that fixes the test issue --- bot/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot/build.sh b/bot/build.sh index d72ecbdd0c..2d9f24628e 100755 --- a/bot/build.sh +++ b/bot/build.sh @@ -3,7 +3,7 @@ # give up as soon as any error occurs set -e -git clone https://github.com/EESSI/software-layer-scripts +git clone https://github.com/casparl/software-layer-scripts --branch fix_test_accelerator_override # symlink everything, except for: # - common files like LICENSE and README.md From f61266f9d66851ae95942c18adfe3e7ae7b9399c Mon Sep 17 00:00:00 2001 From: Caspar van Leeuwen Date: Thu, 10 Jul 2025 13:09:49 +0200 Subject: [PATCH 05/19] Fix gh username --- bot/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot/build.sh b/bot/build.sh index 2d9f24628e..6f4143ad2a 100755 --- a/bot/build.sh +++ b/bot/build.sh @@ -3,7 +3,7 @@ # give up as soon as any error occurs set -e -git clone https://github.com/casparl/software-layer-scripts --branch fix_test_accelerator_override +git clone https://github.com/casparvl/software-layer-scripts --branch fix_test_accelerator_override # symlink everything, except for: # - common files like LICENSE and README.md From 829053f0c9409da5b71e9cc2593110e2792c8929 Mon Sep 17 00:00:00 2001 From: crivella Date: Fri, 25 Jul 2025 14:52:44 +0200 Subject: [PATCH 06/19] Add estack file for 5.1.1-2023a + Octave easyconfig --- .../2023.06/eessi-2023.06-eb-5.1.1-2023a.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-2023a.yml diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-2023a.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-2023a.yml new file mode 100644 index 0000000000..19c6ff219f --- /dev/null +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-2023a.yml @@ -0,0 +1,5 @@ +easyconfigs: + - Octave-10.1.0-foss-2023a.eb: + options: + # see https://github.com/easybuilders/easybuild-easyconfigs/pull/22932 + from-commit: 3211d34eb16ff31b8de3dfef55ecaaf1ec205c6f From 0f64d7722cef396b1f51f391f87b090698a6c3bf Mon Sep 17 00:00:00 2001 From: crivella Date: Fri, 25 Jul 2025 15:10:17 +0200 Subject: [PATCH 07/19] Added explicit GraphicsMagick dependency with PR with fixx --- .../2023.06/eessi-2023.06-eb-5.1.1-2023a.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-2023a.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-2023a.yml index 19c6ff219f..c533d16bc6 100644 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-2023a.yml +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-2023a.yml @@ -1,5 +1,10 @@ easyconfigs: + - GraphicsMagick-1.3.45-GCCcore-12.3.0.eb: + options: + # See https://github.com/easybuilders/easybuild-easyconfigs/pull/22930 + # We add also GraphicsMagick explicitly to make sure the version with the fix for libtiff is used + from-commit: ca5dddb65171a50207fd8a85559edb4b4844d69b - Octave-10.1.0-foss-2023a.eb: options: - # see https://github.com/easybuilders/easybuild-easyconfigs/pull/22932 + # See https://github.com/easybuilders/easybuild-easyconfigs/pull/22932 from-commit: 3211d34eb16ff31b8de3dfef55ecaaf1ec205c6f From 83261108687da31610e7796cf68e323f1cec5d66 Mon Sep 17 00:00:00 2001 From: Alan O'Cais Date: Tue, 29 Jul 2025 16:35:01 +0200 Subject: [PATCH 08/19] Add holes created by updated dependencies of Qt5 from EB 5.1.1 --- .../software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-2023a.yml | 2 ++ .../software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-2023b.yml | 1 + 2 files changed, 3 insertions(+) create mode 100644 easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-2023a.yml diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-2023a.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-2023a.yml new file mode 100644 index 0000000000..8dd9f754ec --- /dev/null +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-2023a.yml @@ -0,0 +1,2 @@ +easyconfigs: + - libheif-1.17.6-GCCcore-12.3.0.eb diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-2023b.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-2023b.yml index 29d1dc5f7e..deb46fc607 100644 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-2023b.yml +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-2023b.yml @@ -1,2 +1,3 @@ easyconfigs: - openCARP-17.0-foss-2023b.eb + - libheif-1.19.5-GCCcore-13.2.0.eb From 39403276f8a1af8649a1dd8c6b7c0af2f3225dd7 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Tue, 5 Aug 2025 13:14:15 +0200 Subject: [PATCH 09/19] {2025.06} GCC 13.3.0 + 14.2.0 --- .../2025.06/eessi-2025.06-eb-5.1.1-GCC-13.3.0.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.1-GCC-13.3.0.yml diff --git a/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.1-GCC-13.3.0.yml b/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.1-GCC-13.3.0.yml new file mode 100644 index 0000000000..9f46304ed7 --- /dev/null +++ b/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.1-GCC-13.3.0.yml @@ -0,0 +1,3 @@ +easyconfigs: + - GCC-13.3.0.eb + - GCC-14.2.0.eb From daa1fad8a616029c2d2c8b8e53cc4e9379603e07 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Thu, 7 Aug 2025 16:46:52 +0200 Subject: [PATCH 10/19] split up in seperate easystack files for 2024a + 2025a generation of easyconfigs --- ...eb-5.1.1-GCC-13.3.0.yml => eessi-2025.06-eb-5.1.1-2024a.yml} | 1 - .../software.eessi.io/2025.06/eessi-2025.06-eb-5.1.1-2025a.yml | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) rename easystacks/software.eessi.io/2025.06/{eessi-2025.06-eb-5.1.1-GCC-13.3.0.yml => eessi-2025.06-eb-5.1.1-2024a.yml} (63%) create mode 100644 easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.1-2025a.yml diff --git a/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.1-GCC-13.3.0.yml b/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.1-2024a.yml similarity index 63% rename from easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.1-GCC-13.3.0.yml rename to easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.1-2024a.yml index 9f46304ed7..534c0325e7 100644 --- a/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.1-GCC-13.3.0.yml +++ b/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.1-2024a.yml @@ -1,3 +1,2 @@ easyconfigs: - GCC-13.3.0.eb - - GCC-14.2.0.eb diff --git a/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.1-2025a.yml b/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.1-2025a.yml new file mode 100644 index 0000000000..c1ecde53dd --- /dev/null +++ b/easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.1.1-2025a.yml @@ -0,0 +1,2 @@ +easyconfigs: + - GCC-14.2.0.eb From b92f5de13df4dbbf6b0d32676966d7d79b2ceaef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danilo=20Gonz=C3=A1lez?= Date: Mon, 11 Aug 2025 17:03:37 +0200 Subject: [PATCH 11/19] Update eessi-2023.06-eb-4.9.4-2023a.yml Install BWA-0.7.18-GCCcore-12.3.0.eb as part of the DoitNow test builds on Deucalin --- .../2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023a.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023a.yml b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023a.yml index afc595ce24..cd2b7f44f2 100644 --- a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023a.yml +++ b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023a.yml @@ -294,6 +294,8 @@ easyconfigs: # - BLAST+-2.14.1-gompi-2023a.eb: # options: # from-pr: 20784 +# Test from DoItNow - BLAST+-2.14.1-gompi-2023a.eb - Valgrind-3.21.0-gompi-2023a.eb - OrthoFinder-2.5.5-foss-2023a.eb + - BWA-0.7.18-GCCcore-12.3.0.eb From e86223301993effb06ef390cd60b3f181b7ba8d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danilo=20Gonz=C3=A1lez?= Date: Mon, 11 Aug 2025 17:05:47 +0200 Subject: [PATCH 12/19] minior fix --- .../2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023a.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023a.yml b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023a.yml index cd2b7f44f2..3a2b72c881 100644 --- a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023a.yml +++ b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023a.yml @@ -294,8 +294,8 @@ easyconfigs: # - BLAST+-2.14.1-gompi-2023a.eb: # options: # from-pr: 20784 -# Test from DoItNow - BLAST+-2.14.1-gompi-2023a.eb - Valgrind-3.21.0-gompi-2023a.eb - OrthoFinder-2.5.5-foss-2023a.eb +# Test from DoItNow - BWA-0.7.18-GCCcore-12.3.0.eb From 6bfe723d450dae700b5859747d580aa09ada5ac6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danilo=20Gonz=C3=A1lez?= Date: Thu, 14 Aug 2025 10:18:11 +0200 Subject: [PATCH 13/19] add lit and astropy --- .../2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023b.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023b.yml b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023b.yml index 88cc48fef9..0c28013c6a 100644 --- a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023b.yml +++ b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023b.yml @@ -107,3 +107,13 @@ easyconfigs: # options: # from-pr: 20792 - Valgrind-3.23.0-gompi-2023b.eb + # recipes taken from https://github.com/EESSI/software-layer/pull/996 + - lit-18.1.7-GCCcore-13.2.0.eb: + options: + # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20902 + from-commit: 79f4cf21490f7f5b187af889be5426c1332a497d + - astropy-7.0.0-gfbf-2023b.eb: + options: + # see https://github.com/easybuilders/easybuild-easyconfigs/pull/22469 + from-commit: fc22841fef99cbb2a221c18029b15e692e78c27c + From 98ff5bd25db9d244fdc85ee7c64fba8b7a276ca7 Mon Sep 17 00:00:00 2001 From: Caspar van Leeuwen Date: Wed, 20 Aug 2025 17:54:11 +0200 Subject: [PATCH 14/19] Exclude EasyStacks dir from software-layer-scripts from being symlinked --- bot/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot/build.sh b/bot/build.sh index d72ecbdd0c..2884db8de4 100755 --- a/bot/build.sh +++ b/bot/build.sh @@ -8,7 +8,7 @@ git clone https://github.com/EESSI/software-layer-scripts # symlink everything, except for: # - common files like LICENSE and README.md # - 'bot' subdirectory, there we need to be a bit more careful (see below) -for file in $(ls software-layer-scripts | egrep -v 'LICENSE|README.md|^bot'); do +for file in $(ls software-layer-scripts | egrep -v 'easystacks|LICENSE|README.md|^bot'); do ln -s software-layer-scripts/${file} done From 82dca90df1806429edfb5c7547f6fdfb53dcc1a1 Mon Sep 17 00:00:00 2001 From: laraPPr Date: Thu, 21 Aug 2025 16:02:52 +0200 Subject: [PATCH 15/19] {2023.06}[2023a] MrBayes Signed-off-by: laraPPr --- .../software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-2023a.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-2023a.yml b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-2023a.yml index 1439894f04..66822250d1 100644 --- a/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-2023a.yml +++ b/easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-2023a.yml @@ -9,3 +9,4 @@ easyconfigs: options: # See https://github.com/easybuilders/easybuild-easyconfigs/pull/22932 from-commit: 3211d34eb16ff31b8de3dfef55ecaaf1ec205c6f + - MrBayes-3.2.7-gompi-2023a.eb From ead68fedc6b1842caad7251e16979b7703e53ef1 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 22 Aug 2025 12:07:03 +0200 Subject: [PATCH 16/19] also check on EESSI 2025.06 w.r.t. missing installations and software layer being in sync across CPU targets --- .github/workflows/test-software.eessi.io.yml | 74 +++++++++++++++++--- .github/workflows/test_compare_stacks.yml | 1 + 2 files changed, 66 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test-software.eessi.io.yml b/.github/workflows/test-software.eessi.io.yml index 9d8cb020ba..f936d68834 100644 --- a/.github/workflows/test-software.eessi.io.yml +++ b/.github/workflows/test-software.eessi.io.yml @@ -8,7 +8,6 @@ on: permissions: contents: read # to fetch code (actions/checkout) env: - EESSI_VERSION: '2023.06' EESSI_ACCELERATOR_TARGETS: | x86_64/amd/zen2: - nvidia/cc80 @@ -20,33 +19,90 @@ jobs: fail-fast: false matrix: include: - # Arm CPU targets + # Arm CPU targets (EESSI 2023.06) - runs_on: ubuntu-24.04-arm + EESSI_VERSION: 2023.06 EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/generic - runs_on: ubuntu-24.04-arm + EESSI_VERSION: 2023.06 EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/neoverse_n1 - runs_on: ubuntu-24.04-arm + EESSI_VERSION: 2023.06 EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/neoverse_v1 - runs_on: ubuntu-24.04-arm + EESSI_VERSION: 2023.06 EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/nvidia/grace - # x86_64 CPU targets + # Arm CPU targets (EESSI 2025.06) + - runs_on: ubuntu-24.04-arm + EESSI_VERSION: 2025.06 + EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/a64fx + - runs_on: ubuntu-24.04-arm + EESSI_VERSION: 2025.06 + EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/generic + - runs_on: ubuntu-24.04-arm + EESSI_VERSION: 2025.06 + EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/neoverse_n1 + - runs_on: ubuntu-24.04-arm + EESSI_VERSION: 2025.06 + EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/neoverse_v1 + - runs_on: ubuntu-24.04-arm + EESSI_VERSION: 2025.06 + EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/nvidia/grace + # x86_64 CPU targets (EESSI 2023.06) + - runs_on: ubuntu-24.04 + EESSI_VERSION: 2023.06 + EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/amd/zen2 + - runs_on: ubuntu-24.04 + EESSI_VERSION: 2023.06 + EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/amd/zen3 + - runs_on: ubuntu-24.04 + EESSI_VERSION: 2023.06 + EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/amd/zen4 + - runs_on: ubuntu-24.04 + EESSI_VERSION: 2023.06 + EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/haswell + - runs_on: ubuntu-24.04 + EESSI_VERSION: 2023.06 + EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/sapphirerapids + - runs_on: ubuntu-24.04 + EESSI_VERSION: 2023.06 + EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/skylake_avx512 + - runs_on: ubuntu-24.04 + EESSI_VERSION: 2023.06 + EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/icelake + - runs_on: ubuntu-24.04 + EESSI_VERSION: 2023.06 + EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/cascadelake + - runs_on: ubuntu-24.04 + EESSI_VERSION: 2023.06 + EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/generic + # x86_64 CPU targets (EESSI 2025.06) - runs_on: ubuntu-24.04 + EESSI_VERSION: 2025.06 EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/amd/zen2 - runs_on: ubuntu-24.04 + EESSI_VERSION: 2025.06 EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/amd/zen3 - runs_on: ubuntu-24.04 + EESSI_VERSION: 2025.06 EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/amd/zen4 - runs_on: ubuntu-24.04 + EESSI_VERSION: 2025.06 EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/haswell - runs_on: ubuntu-24.04 + EESSI_VERSION: 2025.06 EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/sapphirerapids - runs_on: ubuntu-24.04 + EESSI_VERSION: 2025.06 EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/skylake_avx512 - runs_on: ubuntu-24.04 + EESSI_VERSION: 2025.06 EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/icelake - runs_on: ubuntu-24.04 + EESSI_VERSION: 2025.06 EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/cascadelake - runs_on: ubuntu-24.04 + EESSI_VERSION: 2025.06 EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/generic runs-on: ${{ matrix.runs_on }} steps: @@ -77,17 +133,17 @@ jobs: - name: Check for missing installlations run: | export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}} - source /cvmfs/software.eessi.io/versions/${EESSI_VERSION}/init/bash + source /cvmfs/software.eessi.io/versions/${{matrix.EESSI_VERSION}}/init/bash # set $EESSI_CPU_FAMILY to the CPU architecture that corresponds to $EESSI_SOFTWARE_SUBDIR_OVERRIDE (part before the first slash), # to prevent issues with checks in the Easybuild configuration that use this variable export EESSI_CPU_FAMILY=${EESSI_SOFTWARE_SUBDIR_OVERRIDE%%/*} - export EESSI_PREFIX=/cvmfs/software.eessi.io/versions/${EESSI_VERSION} + export EESSI_PREFIX=/cvmfs/software.eessi.io/versions/${{matrix.EESSI_VERSION}} export EESSI_OS_TYPE=linux env | grep ^EESSI | sort # first check the CPU-only builds for this CPU target echo "first run check_missing_installations.sh for CPU-only builds" - for easystack_file in $(EESSI_VERSION=${EESSI_VERSION} .github/workflows/scripts/only_latest_easystacks.sh); do + for easystack_file in $(EESSI_VERSION=${{matrix.EESSI_VERSION}} .github/workflows/scripts/only_latest_easystacks.sh); do eb_version=$(echo ${easystack_file} | sed 's/.*eb-\([0-9.]*\).*.yml/\1/g') echo "check missing installations for ${easystack_file} with EasyBuild ${eb_version}..." module purge @@ -107,7 +163,7 @@ jobs: for accel in ${accelerators}; do module use ${EESSI_SOFTWARE_PATH}/accel/${accel}/modules/all echo "checking missing installations for accelerator ${accel} using modulepath: ${MODULEPATH}" - for easystack_file in $(EESSI_VERSION=${EESSI_VERSION} ACCEL_EASYSTACKS=1 .github/workflows/scripts/only_latest_easystacks.sh); do + for easystack_file in $(EESSI_VERSION=${{matrix.EESSI_VERSION}} ACCEL_EASYSTACKS=1 .github/workflows/scripts/only_latest_easystacks.sh); do eb_version=$(echo ${easystack_file} | sed 's/.*eb-\([0-9.]*\).*.yml/\1/g') echo "check missing installations for ${easystack_file} with EasyBuild ${eb_version}..." module purge @@ -128,14 +184,14 @@ jobs: - name: Test check_missing_installations.sh with missing package (GCC/8.3.0) run: | export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}} - source /cvmfs/software.eessi.io/versions/${EESSI_VERSION}/init/bash + source /cvmfs/software.eessi.io/versions/${{matrix.EESSI_VERSION}}/init/bash # set $EESSI_CPU_FAMILY to the CPU architecture that corresponds to $EESSI_SOFTWARE_SUBDIR_OVERRIDE (part before the first slash), # to prevent issues with checks in the Easybuild configuration that use this variable export EESSI_CPU_FAMILY=${EESSI_SOFTWARE_SUBDIR_OVERRIDE%%/*} module load EasyBuild which eb eb --version - export EESSI_PREFIX=/cvmfs/software.eessi.io/versions/${EESSI_VERSION} + export EESSI_PREFIX=/cvmfs/software.eessi.io/versions/${{matrix.EESSI_VERSION}} export EESSI_OS_TYPE=linux env | grep ^EESSI | sort # create dummy easystack file with a single entry (something that is not installed in EESSI) diff --git a/.github/workflows/test_compare_stacks.yml b/.github/workflows/test_compare_stacks.yml index 8458047cfe..44e1dcc057 100644 --- a/.github/workflows/test_compare_stacks.yml +++ b/.github/workflows/test_compare_stacks.yml @@ -21,6 +21,7 @@ jobs: matrix: EESSI_VERSION: - 2023.06 + - 2025.06 COMPARISON_ARCH: - aarch64/neoverse_n1 - aarch64/neoverse_v1 From a62b125267c1f2f36df90b8a9a71b9651e33548b Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Fri, 22 Aug 2025 13:47:11 +0200 Subject: [PATCH 17/19] also include aarch/a64fx in comparison for EESSI 2025.06 --- .github/workflows/test_compare_stacks.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/test_compare_stacks.yml b/.github/workflows/test_compare_stacks.yml index 44e1dcc057..00c4af099a 100644 --- a/.github/workflows/test_compare_stacks.yml +++ b/.github/workflows/test_compare_stacks.yml @@ -23,6 +23,7 @@ jobs: - 2023.06 - 2025.06 COMPARISON_ARCH: + - aarch64/a64fx - aarch64/neoverse_n1 - aarch64/neoverse_v1 - aarch64/nvidia/grace @@ -34,6 +35,9 @@ jobs: - x86_64/intel/sapphirerapids - x86_64/intel/icelake - x86_64/intel/cascadelake + exclude: + - EESSI_VERSION: 2023.06 + COMPARISON_ARCH: aarch64/a64fx steps: - name: Check out software-layer repository uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 From 3f9af3b20332a9d431d33bfe0b83dfbc69f3b39f Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Mon, 25 Aug 2025 15:58:45 +0200 Subject: [PATCH 18/19] remove useless comment from easystack file --- .../2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023a.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023a.yml b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023a.yml index 3a2b72c881..9cf21493e6 100644 --- a/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023a.yml +++ b/easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023a.yml @@ -297,5 +297,4 @@ easyconfigs: - BLAST+-2.14.1-gompi-2023a.eb - Valgrind-3.21.0-gompi-2023a.eb - OrthoFinder-2.5.5-foss-2023a.eb -# Test from DoItNow - BWA-0.7.18-GCCcore-12.3.0.eb From 259417709263cc4be7f99a81417e28bea3c1a9d7 Mon Sep 17 00:00:00 2001 From: Caspar van Leeuwen <33718780+casparvl@users.noreply.github.com> Date: Tue, 26 Aug 2025 17:12:30 +0200 Subject: [PATCH 19/19] Update bot/build.sh --- bot/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot/build.sh b/bot/build.sh index 6f4143ad2a..d72ecbdd0c 100755 --- a/bot/build.sh +++ b/bot/build.sh @@ -3,7 +3,7 @@ # give up as soon as any error occurs set -e -git clone https://github.com/casparvl/software-layer-scripts --branch fix_test_accelerator_override +git clone https://github.com/EESSI/software-layer-scripts # symlink everything, except for: # - common files like LICENSE and README.md