Merge branch '2023.06' into tensorflow_2021b

EESSI · Sep 6, 2023 · 65b6e9a · 65b6e9a
2 parents d5f73db + 8599f76
commit 65b6e9a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/eessi-2023.06-eb-4.7.2-2021a.yml b/eessi-2023.06-eb-4.7.2-2021a.yml
@@ -6,6 +6,7 @@ easyconfigs:
   - foss-2021a
   - libpng-1.6.37-GCCcore-10.3.0.eb:
   - libjpeg-turbo-2.0.6-GCCcore-10.3.0.eb
+  - git-2.32.0-GCCcore-10.3.0-nodocs.eb
   - QuantumESPRESSO-6.7-foss-2021a.eb
   - GROMACS-2021.3-foss-2021a.eb
   - Qt5-5.15.2-GCCcore-10.3.0.eb:

diff --git a/eessi-2023.06-eb-4.7.2-2021b.yml b/eessi-2023.06-eb-4.7.2-2021b.yml
@@ -11,6 +11,7 @@ easyconfigs:
   - gompi-2021b
   - FlexiBLAS-3.0.4-GCC-11.2.0.eb
   - foss-2021b.eb
+  - git-2.33.1-GCCcore-11.2.0-nodocs.eb
   - QuantumESPRESSO-6.8-foss-2021b.eb
   - SciPy-bundle-2021.10-foss-2021b
   - GROMACS-2021.5-foss-2021b.eb
diff --git a/eessi-2023.06-eb-4.7.2-system.yml b/eessi-2023.06-eb-4.7.2-system.yml
@@ -1,5 +1,7 @@
 easyconfigs:
-  - ReFrame-4.2.0
+  - ReFrame-4.2.0.eb:
+      options:
+        from-pr: 18320
   - EasyBuild-4.8.0.eb:
       options:
         from-pr: 18282