From aa675ab20690704a69750a1ac18216f7921dffd6 Mon Sep 17 00:00:00 2001
From: lara <lara@localhost.localdomain>
Date: Fri, 27 Sep 2024 16:09:00 +0200
Subject: [PATCH 1/4] add missing check for zen4

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

diff --git a/.github/workflows/test-software.eessi.io.yml b/.github/workflows/test-software.eessi.io.yml
index e247c96676..e774180d99 100644
--- a/.github/workflows/test-software.eessi.io.yml
+++ b/.github/workflows/test-software.eessi.io.yml
@@ -27,6 +27,7 @@ jobs:
         - aarch64/neoverse_v1
         - x86_64/amd/zen2
         - x86_64/amd/zen3
+        - x86_64/amd/zen4
         - x86_64/intel/haswell
         - x86_64/intel/skylake_avx512
         - x86_64/generic
@@ -58,6 +59,9 @@ jobs:
               # first check the CPU-only builds for this CPU target
               echo "just run check_missing_installations.sh (should use easystacks/software.eessi.io/${{matrix.EESSI_VERSION}}/eessi-${{matrix.EESSI_VERSION}}-*.yml)"
               for easystack_file in $(ls easystacks/software.eessi.io/${{matrix.EESSI_VERSION}}/eessi-${{matrix.EESSI_VERSION}}-eb-*.yml); do
+                  if [ ${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}} = "x86_64/amd/zen4" ] && grep -q 2022b <<<"${easystack_file}"; then
+                      continue
+                  fi
                   echo "check missing installations for ${easystack_file}..."
                   ./check_missing_installations.sh ${easystack_file}
                   ec=$?

From 64b7958071fe672499e0b4f571be0805cac80ea7 Mon Sep 17 00:00:00 2001
From: Lara Ramona Peeters <49882639+laraPPr@users.noreply.github.com>
Date: Fri, 27 Sep 2024 21:26:03 +0200
Subject: [PATCH 2/4] exclude CUDA builds in CPU path

---
 .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 e774180d99..39972ef18f 100644
--- a/.github/workflows/test-software.eessi.io.yml
+++ b/.github/workflows/test-software.eessi.io.yml
@@ -59,7 +59,7 @@ jobs:
               # first check the CPU-only builds for this CPU target
               echo "just run check_missing_installations.sh (should use easystacks/software.eessi.io/${{matrix.EESSI_VERSION}}/eessi-${{matrix.EESSI_VERSION}}-*.yml)"
               for easystack_file in $(ls easystacks/software.eessi.io/${{matrix.EESSI_VERSION}}/eessi-${{matrix.EESSI_VERSION}}-eb-*.yml); do
-                  if [ ${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}} = "x86_64/amd/zen4" ] && grep -q 2022b <<<"${easystack_file}"; then
+                  if [ ${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}} = "x86_64/amd/zen4" ] && grep -q 2022b <<<"${easystack_file}" || grep -q CUDA <<<"${easystack_file}"; then
                       continue
                   fi
                   echo "check missing installations for ${easystack_file}..."

From ede35425aa97cc898997c939b1f0036cc0b8797d Mon Sep 17 00:00:00 2001
From: Lara Ramona Peeters <49882639+laraPPr@users.noreply.github.com>
Date: Fri, 27 Sep 2024 21:43:46 +0200
Subject: [PATCH 3/4] fix conditional for CUDA

---
 .github/workflows/test-software.eessi.io.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-software.eessi.io.yml b/.github/workflows/test-software.eessi.io.yml
index 39972ef18f..29af8f57f1 100644
--- a/.github/workflows/test-software.eessi.io.yml
+++ b/.github/workflows/test-software.eessi.io.yml
@@ -59,8 +59,12 @@ jobs:
               # first check the CPU-only builds for this CPU target
               echo "just run check_missing_installations.sh (should use easystacks/software.eessi.io/${{matrix.EESSI_VERSION}}/eessi-${{matrix.EESSI_VERSION}}-*.yml)"
               for easystack_file in $(ls easystacks/software.eessi.io/${{matrix.EESSI_VERSION}}/eessi-${{matrix.EESSI_VERSION}}-eb-*.yml); do
-                  if [ ${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}} = "x86_64/amd/zen4" ] && grep -q 2022b <<<"${easystack_file}" || grep -q CUDA <<<"${easystack_file}"; then
-                      continue
+                  if [ ${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}} = "x86_64/amd/zen4" ]; then
+                      if grep -q 2022b <<<"${easystack_file}"; then
+                          continue
+                      elif grep -q CUDA <<<"${easystack_file}"; then
+                          continue
+                      fi
                   fi
                   echo "check missing installations for ${easystack_file}..."
                   ./check_missing_installations.sh ${easystack_file}

From e3682e61f136215486016389b73dfd0570621c07 Mon Sep 17 00:00:00 2001
From: Lara Ramona Peeters <49882639+laraPPr@users.noreply.github.com>
Date: Mon, 30 Sep 2024 14:53:59 +0200
Subject: [PATCH 4/4] add comments to CI

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

diff --git a/.github/workflows/test-software.eessi.io.yml b/.github/workflows/test-software.eessi.io.yml
index 29af8f57f1..6f592cf4c4 100644
--- a/.github/workflows/test-software.eessi.io.yml
+++ b/.github/workflows/test-software.eessi.io.yml
@@ -61,8 +61,10 @@ jobs:
               for easystack_file in $(ls easystacks/software.eessi.io/${{matrix.EESSI_VERSION}}/eessi-${{matrix.EESSI_VERSION}}-eb-*.yml); do
                   if [ ${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}} = "x86_64/amd/zen4" ]; then
                       if grep -q 2022b <<<"${easystack_file}"; then
+                          # skip the check of installed software on zen4 for foss/2022b builds
                           continue
                       elif grep -q CUDA <<<"${easystack_file}"; then
+                          # skip the check of install CUDA software in the CPU path for zen4
                           continue
                       fi
                   fi