From 53f93d329ed868597d362f072906584fb22d0b9b Mon Sep 17 00:00:00 2001
From: Thomas Roeblitz <thomas.roblitz@uib.no>
Date: Tue, 21 Mar 2023 13:51:15 +0100
Subject: [PATCH 1/2] install GCC/10.3.0, remove one --from-pr & fix easystack
 file

---
 EESSI-pilot-install-software.sh | 2 +-
 check_missing_installations.sh  | 4 +++-
 eessi-2022.11.yml               | 1 -
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/EESSI-pilot-install-software.sh b/EESSI-pilot-install-software.sh
index 0fa756b42f..476ae2d11d 100755
--- a/EESSI-pilot-install-software.sh
+++ b/EESSI-pilot-install-software.sh
@@ -476,7 +476,7 @@ export GCC_EC="GCC-10.3.0.eb"
 echo ">> Starting slow with ${GCC_EC}..."
 ok_msg="${GCC_EC} installed, yippy! Off to a good start..."
 fail_msg="Installation of ${GCC_EC} failed!"
-$EB --robot  GCCcore-10.3.0.eb
+$EB --robot ${GCC_EC}
 check_exit_code $? "${ok_msg}" "${fail_msg}"
 
 # install Java 17
diff --git a/check_missing_installations.sh b/check_missing_installations.sh
index 45f276dee1..484769a72c 100755
--- a/check_missing_installations.sh
+++ b/check_missing_installations.sh
@@ -26,7 +26,9 @@ fail_msg="On no, some installations are still missing, how did that happen?!"
 eb_missing_out=$LOCAL_TMPDIR/eb_missing.out
 # we need to use --from-pr to pull in some easyconfigs that are not available in EasyBuild version being used
 # PR #16531: Nextflow-22.10.1.eb
-${EB:-eb} --from-pr 16531 --easystack eessi-${EESSI_PILOT_VERSION}.yml --experimental --missing | tee ${eb_missing_out}
+# ${EB:-eb} --from-pr 16531 --easystack eessi-${EESSI_PILOT_VERSION}.yml --experimental --missing | tee ${eb_missing_out}
+# PR 16531 not needed since we use EB v4.7.0
+${EB:-eb} --easystack eessi-${EESSI_PILOT_VERSION}.yml --experimental --missing | tee ${eb_missing_out}
 
 # the above assesses the installed software for each easyconfig provided in
 # the easystack file and then print messages such as
diff --git a/eessi-2022.11.yml b/eessi-2022.11.yml
index 2f284622ed..92498b4cbf 100644
--- a/eessi-2022.11.yml
+++ b/eessi-2022.11.yml
@@ -1,6 +1,5 @@
 easyconfigs:
   - EasyBuild-4.6.2.eb
-  - EasyBuild-4.7.0.eb
   - Java-11.eb
   - Java-17.eb
   - GCC-9.3.0.eb

From a9a61ee03cd0547ade8d48256e2536dbfacd2b0d Mon Sep 17 00:00:00 2001
From: Thomas Roeblitz <thomas.roblitz@uib.no>
Date: Tue, 21 Mar 2023 16:45:25 +0100
Subject: [PATCH 2/2] we need to keep --from-pr or GHA break

---
 check_missing_installations.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/check_missing_installations.sh b/check_missing_installations.sh
index 484769a72c..eb159d7835 100755
--- a/check_missing_installations.sh
+++ b/check_missing_installations.sh
@@ -28,7 +28,9 @@ eb_missing_out=$LOCAL_TMPDIR/eb_missing.out
 # PR #16531: Nextflow-22.10.1.eb
 # ${EB:-eb} --from-pr 16531 --easystack eessi-${EESSI_PILOT_VERSION}.yml --experimental --missing | tee ${eb_missing_out}
 # PR 16531 not needed since we use EB v4.7.0
-${EB:-eb} --easystack eessi-${EESSI_PILOT_VERSION}.yml --experimental --missing | tee ${eb_missing_out}
+# this, however, breaks the GHA https://github.com/NorESSI/software-layer/blob/main/.github/workflows/test_eessi.yml
+# because it uses the EESSI pilot which only provides EB 4.5.1, so adding it back
+${EB:-eb} --from-pr 16531 --easystack eessi-${EESSI_PILOT_VERSION}.yml --experimental --missing | tee ${eb_missing_out}
 
 # the above assesses the installed software for each easyconfig provided in
 # the easystack file and then print messages such as