From 2f797158889b4d9d197dfbad758c336c5c67c73e Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <casparl@int5.local.snellius.surf.nl>
Date: Thu, 16 Apr 2026 17:59:31 +0200
Subject: [PATCH 01/23] Adding ROCm-LLVM

---
 .../2025.06/accel/amd/eessi-2025.06-eb-5.2.1-001-system.yml     | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.2.1-001-system.yml

diff --git a/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.2.1-001-system.yml b/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.2.1-001-system.yml
new file mode 100644
index 0000000000..ec4a270a24
--- /dev/null
+++ b/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.2.1-001-system.yml
@@ -0,0 +1,2 @@
+easyconfigs:
+  - ROCm-LLVM-19.0.0-GCCcore-14.2.0-ROCm-6.4.1.eb

From 61026883bed0f8d330d8ec411008acfa9857e668 Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <casparl@int5.local.snellius.surf.nl>
Date: Thu, 16 Apr 2026 18:15:42 +0200
Subject: [PATCH 02/23] Renamed so as to use EB 5.3.0

---
 ...5.2.1-001-system.yml => eessi-2025.06-eb-5.3.0-001-system.yml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename easystacks/software.eessi.io/2025.06/accel/amd/{eessi-2025.06-eb-5.2.1-001-system.yml => eessi-2025.06-eb-5.3.0-001-system.yml} (100%)

diff --git a/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.2.1-001-system.yml b/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-001-system.yml
similarity index 100%
rename from easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.2.1-001-system.yml
rename to easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-001-system.yml

From ac84877cf43fc3a5703c06037b5f7d34b20d9078 Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <33718780+casparvl@users.noreply.github.com>
Date: Tue, 21 Apr 2026 16:48:04 +0200
Subject: [PATCH 03/23] Rename eessi-2025.06-eb-5.3.0-001-system.yml to
 eessi-2025.06-eb-5.3.0-foss-2025a.yml

---
 ...5.3.0-001-system.yml => eessi-2025.06-eb-5.3.0-foss-2025a.yml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename easystacks/software.eessi.io/2025.06/accel/amd/{eessi-2025.06-eb-5.3.0-001-system.yml => eessi-2025.06-eb-5.3.0-foss-2025a.yml} (100%)

diff --git a/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-001-system.yml b/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-foss-2025a.yml
similarity index 100%
rename from easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-001-system.yml
rename to easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-foss-2025a.yml

From 81acb51be5dc3f192d1110f6bd33011c489f9e12 Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <33718780+casparvl@users.noreply.github.com>
Date: Tue, 21 Apr 2026 17:21:52 +0200
Subject: [PATCH 04/23] Rename eessi-2025.06-eb-5.3.0-foss-2025a.yml to
 eessi-2025.06-eb-5.3.0-2025a.yml

---
 ...6-eb-5.3.0-foss-2025a.yml => eessi-2025.06-eb-5.3.0-2025a.yml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename easystacks/software.eessi.io/2025.06/accel/amd/{eessi-2025.06-eb-5.3.0-foss-2025a.yml => eessi-2025.06-eb-5.3.0-2025a.yml} (100%)

diff --git a/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-foss-2025a.yml b/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml
similarity index 100%
rename from easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-foss-2025a.yml
rename to easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml

From 474c2cf1b0c160ab2ac020190301478d0d31a971 Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <casparl@int3.local.snellius.surf.nl>
Date: Thu, 23 Apr 2026 15:02:41 +0200
Subject: [PATCH 05/23] Reduce max parallelism, as it seems we run out of
 memory

---
 .../2025.06/accel/amd/eessi-2025.06-eb-5.3.0-001-system.yml   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-001-system.yml b/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-001-system.yml
index ec4a270a24..ebafb52288 100644
--- a/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-001-system.yml
+++ b/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-001-system.yml
@@ -1,2 +1,4 @@
 easyconfigs:
-  - ROCm-LLVM-19.0.0-GCCcore-14.2.0-ROCm-6.4.1.eb
+  - ROCm-LLVM-19.0.0-GCCcore-14.2.0-ROCm-6.4.1.eb:
+      options:
+        --parallel=8

From 7950f5bcd580cc6678dd4c73792d68077f991917 Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <casparl@int3.local.snellius.surf.nl>
Date: Thu, 23 Apr 2026 16:41:55 +0200
Subject: [PATCH 06/23] Restructure option

---
 .../2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml b/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml
index ebafb52288..e5ff7f1347 100644
--- a/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml
+++ b/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml
@@ -1,4 +1,4 @@
 easyconfigs:
   - ROCm-LLVM-19.0.0-GCCcore-14.2.0-ROCm-6.4.1.eb:
       options:
-        --parallel=8
+        --parallel 8

From c45b40f8bca3b7248c441bec8bc3da9203af7a1c Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <casparl@int3.local.snellius.surf.nl>
Date: Thu, 23 Apr 2026 17:06:47 +0200
Subject: [PATCH 07/23] Fix the way we define the option

---
 .../2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml b/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml
index e5ff7f1347..4f0ffd10ec 100644
--- a/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml
+++ b/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml
@@ -1,4 +1,4 @@
 easyconfigs:
   - ROCm-LLVM-19.0.0-GCCcore-14.2.0-ROCm-6.4.1.eb:
       options:
-        --parallel 8
+        parallel: 8

From 0621c037214ee492ea17cc62ec4e3816e37a0feb Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <casparl@tcn399.local.snellius.surf.nl>
Date: Tue, 28 Apr 2026 14:47:43 +0200
Subject: [PATCH 08/23] Add patch for aarch64 missing declaration to resolve
 https://github.com/EESSI/software-layer/pull/1473#issuecomment-4302630567

---
 .../2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml b/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml
index 4f0ffd10ec..0d31b13b33 100644
--- a/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml
+++ b/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml
@@ -2,3 +2,4 @@ easyconfigs:
   - ROCm-LLVM-19.0.0-GCCcore-14.2.0-ROCm-6.4.1.eb:
       options:
         parallel: 8
+        from-commit: 30f75b9415f7f545765288c30501775891a3147a

From 266f0c8604f40e8160ef2f54da1607450d2e6c24 Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <casparl@tcn399.local.snellius.surf.nl>
Date: Tue, 28 Apr 2026 15:25:38 +0200
Subject: [PATCH 09/23] Use from-pr for now, as this commit didn't change both
 files

---
 .../2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml b/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml
index 0d31b13b33..4483c1a94f 100644
--- a/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml
+++ b/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml
@@ -2,4 +2,4 @@ easyconfigs:
   - ROCm-LLVM-19.0.0-GCCcore-14.2.0-ROCm-6.4.1.eb:
       options:
         parallel: 8
-        from-commit: 30f75b9415f7f545765288c30501775891a3147a
+        from-pr: 25864

From 7227c4cf93d117ac841f9fd8f42da03ff250163f Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <casparl@cn7.esc.surfsara.nl>
Date: Wed, 29 Apr 2026 11:56:58 +0200
Subject: [PATCH 10/23] 8 cores was taking forever, lets try 12 to see if we
 don't run OOM

---
 .../2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml b/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml
index 4483c1a94f..04257c37f2 100644
--- a/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml
+++ b/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml
@@ -1,5 +1,5 @@
 easyconfigs:
   - ROCm-LLVM-19.0.0-GCCcore-14.2.0-ROCm-6.4.1.eb:
       options:
-        parallel: 8
+        parallel: 12
         from-pr: 25864

From f1c0bd2464fa90bee83bde0560f5d10c23cdd4d3 Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <33718780+casparvl@users.noreply.github.com>
Date: Mon, 4 May 2026 09:59:09 +0200
Subject: [PATCH 11/23] Update eessi-2025.06-eb-5.3.0-2025a.yml

Update to newer EasyBuild PR
---
 .../2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml b/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml
index 04257c37f2..761f00be73 100644
--- a/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml
+++ b/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml
@@ -2,4 +2,4 @@ easyconfigs:
   - ROCm-LLVM-19.0.0-GCCcore-14.2.0-ROCm-6.4.1.eb:
       options:
         parallel: 12
-        from-pr: 25864
+        from-pr: 25873

From 54740735ece9c7106381b6cc307d3f4536372b27 Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <33718780+casparvl@users.noreply.github.com>
Date: Mon, 4 May 2026 12:11:30 +0200
Subject: [PATCH 12/23] Go back to the old PR, that contained important
 patches. We will merge the upstream PRs into this one

---
 .../2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml b/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml
index 761f00be73..04257c37f2 100644
--- a/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml
+++ b/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml
@@ -2,4 +2,4 @@ easyconfigs:
   - ROCm-LLVM-19.0.0-GCCcore-14.2.0-ROCm-6.4.1.eb:
       options:
         parallel: 12
-        from-pr: 25873
+        from-pr: 25864

From 35441e4c2afd863b3b299a078a5c934884778655 Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <33718780+casparvl@users.noreply.github.com>
Date: Mon, 4 May 2026 18:09:59 +0200
Subject: [PATCH 13/23] Update eessi-2025.06-eb-5.3.0-2025a.yml

Update to newer PR. No more patching for AArch64, we won't build for it.
---
 .../2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml b/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml
index 04257c37f2..761f00be73 100644
--- a/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml
+++ b/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml
@@ -2,4 +2,4 @@ easyconfigs:
   - ROCm-LLVM-19.0.0-GCCcore-14.2.0-ROCm-6.4.1.eb:
       options:
         parallel: 12
-        from-pr: 25864
+        from-pr: 25873

From 4d65a19b13e8eb457fa972f320666b034fcc363e Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <33718780+casparvl@users.noreply.github.com>
Date: Thu, 7 May 2026 13:11:42 +0200
Subject: [PATCH 14/23] Apply suggestion from @ocaisa

Co-authored-by: ocaisa <alan.ocais@cecam.org>
---
 .../2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml b/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml
index 761f00be73..5f7431eaf3 100644
--- a/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml
+++ b/easystacks/software.eessi.io/2025.06/accel/amd/eessi-2025.06-eb-5.3.0-2025a.yml
@@ -1,5 +1,5 @@
 easyconfigs:
   - ROCm-LLVM-19.0.0-GCCcore-14.2.0-ROCm-6.4.1.eb:
       options:
-        parallel: 12
-        from-pr: 25873
+        # See https://github.com/easybuilders/easybuild-easyconfigs/pull/25873
+        from-commit: 69821ba47c0666e3cf1a3a159ddacfef5ee7f34d

From 546b971d650d51f52c5fb85d979d57321617134d Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <casparl@int4.local.snellius.surf.nl>
Date: Thu, 7 May 2026 14:12:09 +0200
Subject: [PATCH 15/23] Make sure we don't check nvidia prefixes for AMD-GPU
 based easystacks. Also, add AMD GPUs to the known architectures. Make sure
 that for Aarch64, we only check nvidia prefixes

---
 .github/workflows/test-software.eessi.io.yml | 60 +++++++++++++++++---
 1 file changed, 51 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test-software.eessi.io.yml b/.github/workflows/test-software.eessi.io.yml
index 6457d25710..44f0204aa2 100644
--- a/.github/workflows/test-software.eessi.io.yml
+++ b/.github/workflows/test-software.eessi.io.yml
@@ -30,7 +30,39 @@ env:
         - nvidia/cc90
         - nvidia/cc100
         - nvidia/cc120
+        - amd/gfx908
+        - amd/gfx90a
+        - amd/gfx942
+        - amd/gfx1030
+        - amd/gfx1100
+        - amd/gfx1101
+        - amd/gfx1200
+        - amd/gfx1201
       # and then allow for special cases for specific architectures
+      aarch64/generic:
+        - nvidia/cc70
+        - nvidia/cc80
+        - nvidia/cc90
+        - nvidia/cc100
+        - nvidia/cc120
+      aarch64/neoverse_n1:
+        - nvidia/cc70
+        - nvidia/cc80
+        - nvidia/cc90
+        - nvidia/cc100
+        - nvidia/cc120
+      aarch64/neoverse_v1:
+        - nvidia/cc70
+        - nvidia/cc80
+        - nvidia/cc90
+        - nvidia/cc100
+        - nvidia/cc120
+      aarch64/nvidia/grace:
+        - nvidia/cc70
+        - nvidia/cc80
+        - nvidia/cc90
+        - nvidia/cc100
+        - nvidia/cc120
       aarch64/a64fx: []
 jobs:
   # Checks whether this PR modifies any easystack files and, if so,
@@ -232,15 +264,25 @@ jobs:
                       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=${{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
-                          module load EasyBuild/${eb_version}
-                          which eb
-                          eb --version
-                          software-layer-scripts/check_missing_installations.sh ${easystack_file}
-                          ec=$?
-                          if [[ ${ec} -ne 0 ]]; then echo "missing installations found for ${easystack_file}!" >&2; exit ${ec}; fi
+                          # Check that the vendor of the accelerator ($accel) matches the vendor name in the easystack filepath
+                          # Only then, do the missing install check
+                          # This avoids e.g. that we're checking for missing AMD GPU installations in an NVIDIA GPU prefix
+                          vendor=echo "${arch#*/}"
+                          if "${easystack_file}" == "*accel/${vendor}*"; then
+                              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
+                              module load EasyBuild/${eb_version}
+                              which eb
+                              eb --version
+                              software-layer-scripts/check_missing_installations.sh ${easystack_file}
+                              ec=$?
+                              if [[ ${ec} -ne 0 ]]; then echo "missing installations found for ${easystack_file}!" >&2; exit ${ec}; fi
+                          else:
+                              msg=Not checking easystack file '${easystack_file}', for accelerator target ${accel}:"
+                              msg="${msg} this easystack file targets a different vendor"
+                              echo "${msg}"
+                          fi
                       done
                       module unuse ${EESSI_SOFTWARE_PATH}/accel/${accel}/modules/all
                   done

From 5ca56a4b54e4718f2c3944f5f7a5ec76d8fff84e Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <casparl@int4.local.snellius.surf.nl>
Date: Thu, 7 May 2026 14:20:06 +0200
Subject: [PATCH 16/23] Missing quote

---
 .github/workflows/test-software.eessi.io.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-software.eessi.io.yml b/.github/workflows/test-software.eessi.io.yml
index 44f0204aa2..354f4519e4 100644
--- a/.github/workflows/test-software.eessi.io.yml
+++ b/.github/workflows/test-software.eessi.io.yml
@@ -279,7 +279,7 @@ jobs:
                               ec=$?
                               if [[ ${ec} -ne 0 ]]; then echo "missing installations found for ${easystack_file}!" >&2; exit ${ec}; fi
                           else:
-                              msg=Not checking easystack file '${easystack_file}', for accelerator target ${accel}:"
+                              msg="Not checking easystack file '${easystack_file}', for accelerator target ${accel}:"
                               msg="${msg} this easystack file targets a different vendor"
                               echo "${msg}"
                           fi

From b96e5ed926da0f1146f180024a0da1bd8ae0897c Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <casparl@int4.local.snellius.surf.nl>
Date: Thu, 7 May 2026 14:33:13 +0200
Subject: [PATCH 17/23] Add some more verbosity

---
 .github/workflows/test-software.eessi.io.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test-software.eessi.io.yml b/.github/workflows/test-software.eessi.io.yml
index 354f4519e4..1918861ca5 100644
--- a/.github/workflows/test-software.eessi.io.yml
+++ b/.github/workflows/test-software.eessi.io.yml
@@ -268,6 +268,7 @@ jobs:
                           # Only then, do the missing install check
                           # This avoids e.g. that we're checking for missing AMD GPU installations in an NVIDIA GPU prefix
                           vendor=echo "${arch#*/}"
+                          echo "Checking if easystack file '${easystack_file}' contains '*accel/${vendor}*'"
                           if "${easystack_file}" == "*accel/${vendor}*"; then
                               eb_version=$(echo ${easystack_file} | sed 's/.*eb-\([0-9.]*\).*.yml/\1/g')
                               echo "check missing installations for ${easystack_file} with EasyBuild ${eb_version}..."

From ead216206d37c1c0ad3fe727acb4ba92f61cd4e2 Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <casparl@int4.local.snellius.surf.nl>
Date: Thu, 7 May 2026 14:37:54 +0200
Subject: [PATCH 18/23] used wrong name for an environment variable. Not sure
 if that was the issue, lets try

---
 .github/workflows/test-software.eessi.io.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-software.eessi.io.yml b/.github/workflows/test-software.eessi.io.yml
index 1918861ca5..b706ff9fed 100644
--- a/.github/workflows/test-software.eessi.io.yml
+++ b/.github/workflows/test-software.eessi.io.yml
@@ -267,7 +267,7 @@ jobs:
                           # Check that the vendor of the accelerator ($accel) matches the vendor name in the easystack filepath
                           # Only then, do the missing install check
                           # This avoids e.g. that we're checking for missing AMD GPU installations in an NVIDIA GPU prefix
-                          vendor=echo "${arch#*/}"
+                          vendor=echo "${accel#*/}"
                           echo "Checking if easystack file '${easystack_file}' contains '*accel/${vendor}*'"
                           if "${easystack_file}" == "*accel/${vendor}*"; then
                               eb_version=$(echo ${easystack_file} | sed 's/.*eb-\([0-9.]*\).*.yml/\1/g')

From c674bb1b669243c37165177556ac04e928c24bb1 Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <casparl@int4.local.snellius.surf.nl>
Date: Thu, 7 May 2026 14:53:40 +0200
Subject: [PATCH 19/23] Stripped the wrong part. NOt sure if that caused the
 issue, but lets fix it anyway

---
 .github/workflows/test-software.eessi.io.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-software.eessi.io.yml b/.github/workflows/test-software.eessi.io.yml
index b706ff9fed..5e888b40e6 100644
--- a/.github/workflows/test-software.eessi.io.yml
+++ b/.github/workflows/test-software.eessi.io.yml
@@ -267,7 +267,7 @@ jobs:
                           # Check that the vendor of the accelerator ($accel) matches the vendor name in the easystack filepath
                           # Only then, do the missing install check
                           # This avoids e.g. that we're checking for missing AMD GPU installations in an NVIDIA GPU prefix
-                          vendor=echo "${accel#*/}"
+                          vendor=echo "${accel%%/*}"  # Remove everything after the first /
                           echo "Checking if easystack file '${easystack_file}' contains '*accel/${vendor}*'"
                           if "${easystack_file}" == "*accel/${vendor}*"; then
                               eb_version=$(echo ${easystack_file} | sed 's/.*eb-\([0-9.]*\).*.yml/\1/g')

From d0bc4af181af490de6a7ab8bca665b5620926173 Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <casparl@int4.local.snellius.surf.nl>
Date: Thu, 7 May 2026 15:02:59 +0200
Subject: [PATCH 20/23] Remove echo, it shoudln't have been there

---
 .github/workflows/test-software.eessi.io.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-software.eessi.io.yml b/.github/workflows/test-software.eessi.io.yml
index 5e888b40e6..67c3ea3194 100644
--- a/.github/workflows/test-software.eessi.io.yml
+++ b/.github/workflows/test-software.eessi.io.yml
@@ -267,7 +267,7 @@ jobs:
                           # Check that the vendor of the accelerator ($accel) matches the vendor name in the easystack filepath
                           # Only then, do the missing install check
                           # This avoids e.g. that we're checking for missing AMD GPU installations in an NVIDIA GPU prefix
-                          vendor=echo "${accel%%/*}"  # Remove everything after the first /
+                          vendor="${accel%%/*}"  # Remove everything after the first /
                           echo "Checking if easystack file '${easystack_file}' contains '*accel/${vendor}*'"
                           if "${easystack_file}" == "*accel/${vendor}*"; then
                               eb_version=$(echo ${easystack_file} | sed 's/.*eb-\([0-9.]*\).*.yml/\1/g')

From db8d4d76f64163d6321e36a44730cf94347c8ac2 Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <casparl@int4.local.snellius.surf.nl>
Date: Thu, 7 May 2026 15:09:51 +0200
Subject: [PATCH 21/23] Add brackets where they should be

---
 .github/workflows/test-software.eessi.io.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-software.eessi.io.yml b/.github/workflows/test-software.eessi.io.yml
index 67c3ea3194..7e3e460fb5 100644
--- a/.github/workflows/test-software.eessi.io.yml
+++ b/.github/workflows/test-software.eessi.io.yml
@@ -269,7 +269,7 @@ jobs:
                           # This avoids e.g. that we're checking for missing AMD GPU installations in an NVIDIA GPU prefix
                           vendor="${accel%%/*}"  # Remove everything after the first /
                           echo "Checking if easystack file '${easystack_file}' contains '*accel/${vendor}*'"
-                          if "${easystack_file}" == "*accel/${vendor}*"; then
+                          if [[ "${easystack_file}" == "*accel/${vendor}*" ]]; then
                               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

From 35fb6549824594f86c742906a79ad02d5196a906 Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <casparl@int4.local.snellius.surf.nl>
Date: Thu, 7 May 2026 15:26:28 +0200
Subject: [PATCH 22/23] Make sure the * are part of a pattern, not a string

---
 .github/workflows/test-software.eessi.io.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-software.eessi.io.yml b/.github/workflows/test-software.eessi.io.yml
index 7e3e460fb5..1211f2e782 100644
--- a/.github/workflows/test-software.eessi.io.yml
+++ b/.github/workflows/test-software.eessi.io.yml
@@ -269,7 +269,7 @@ jobs:
                           # This avoids e.g. that we're checking for missing AMD GPU installations in an NVIDIA GPU prefix
                           vendor="${accel%%/*}"  # Remove everything after the first /
                           echo "Checking if easystack file '${easystack_file}' contains '*accel/${vendor}*'"
-                          if [[ "${easystack_file}" == "*accel/${vendor}*" ]]; then
+                          if [[ "${easystack_file}" == *"accel/${vendor}"* ]]; then
                               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

From 18e38d5935e76e6bf74f5daca38a630015eb9f89 Mon Sep 17 00:00:00 2001
From: Caspar van Leeuwen <casparl@int4.local.snellius.surf.nl>
Date: Thu, 7 May 2026 15:35:44 +0200
Subject: [PATCH 23/23] Fix statement for else sytnax

---
 .github/workflows/test-software.eessi.io.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-software.eessi.io.yml b/.github/workflows/test-software.eessi.io.yml
index 1211f2e782..d4f35d6dd5 100644
--- a/.github/workflows/test-software.eessi.io.yml
+++ b/.github/workflows/test-software.eessi.io.yml
@@ -279,7 +279,7 @@ jobs:
                               software-layer-scripts/check_missing_installations.sh ${easystack_file}
                               ec=$?
                               if [[ ${ec} -ne 0 ]]; then echo "missing installations found for ${easystack_file}!" >&2; exit ${ec}; fi
-                          else:
+                          else
                               msg="Not checking easystack file '${easystack_file}', for accelerator target ${accel}:"
                               msg="${msg} this easystack file targets a different vendor"
                               echo "${msg}"