merge with 2023.06

EESSI · Sep 20, 2023 · 8d60639 · 8d60639
2 parents 37f3dc3 + 41fbcd7
commit 8d60639
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 1 deletion.
diff --git a/.github/workflows/test_eessi.yml b/.github/workflows/test_eessi.yml
@@ -26,8 +26,10 @@ jobs:
         - eessi-2023.06-eb-4.7.2-2022a.yml
         - eessi-2023.06-eb-4.7.2-2022b.yml
         - eessi-2023.06-eb-4.7.2-system.yml
+        - eessi-2023.06-eb-4.8.0-2021a.yml
         - eessi-2023.06-eb-4.8.0-system.yml
         - eessi-2023.06-eb-4.8.0-2021b.yml
+        - eessi-2023.06-eb-4.8.1-system.yml
     steps:
         - name: Check out software-layer repository
           uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0

diff --git a/EESSI-pilot-install-software.sh b/EESSI-pilot-install-software.sh
@@ -172,7 +172,7 @@ else
     echo_green ">> MODULEPATH set up: ${MODULEPATH}"
 fi
 
-for eb_version in '4.7.2' '4.8.0'; do
+for eb_version in '4.7.2' '4.8.0' '4.8.1'; do
 
     # load EasyBuild module (will be installed if it's not available yet)
     source ${TOPDIR}/load_easybuild_module.sh ${eb_version}

diff --git a/eessi-2023.06-eb-4.8.0-2021a.yml b/eessi-2023.06-eb-4.8.0-2021a.yml
@@ -0,0 +1,2 @@
+easyconfigs:
+  - GDAL-3.3.0-foss-2021a.eb
diff --git a/eessi-2023.06-eb-4.8.0-2021b.yml b/eessi-2023.06-eb-4.8.0-2021b.yml
@@ -1,4 +1,10 @@
 easyconfigs:
+  - MPFR-4.1.0-GCCcore-11.2.0.eb:
+      # use patch for MPFR 4.1.0 to fix failing tsprintf test with glibc >= 2.37,
+      # see https://github.com/easybuilders/easybuild-easyconfigs/pull/18746
+      options:
+        from-pr: 18746
+  - OpenFOAM-v2112-foss-2021b.eb
   - TensorFlow-2.7.1-foss-2021b.eb:
       # correctly determine path to active binutils in TensorFlow easyblock,
       # see https://github.com/easybuilders/easybuild-easyblocks/pull/2218

diff --git a/eessi-2023.06-eb-4.8.0-system.yml b/eessi-2023.06-eb-4.8.0-system.yml
@@ -5,3 +5,6 @@ easyconfigs:
       # + https://github.com/easybuilders/easybuild-easyblocks/pull/2995
       options:
         include-easyblocks-from-pr: 2995
+  - EasyBuild-4.8.1.eb:
+      options:
+        from-pr: 18761
diff --git a/eessi-2023.06-eb-4.8.1-system.yml b/eessi-2023.06-eb-4.8.1-system.yml
@@ -0,0 +1,3 @@
+easyconfigs:
+  # rebuilt with EasyBuild v4.8.1 (now wraps around Java/11.0.20)
+  - Java-11.eb