Merge branch '2023.06-software.eessi.io' of github.com:EESSI/software…

…-layer into software_rebuilds

easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.0-2023a.yml

@@ -52,3 +52,4 @@ easyconfigs:
   - ipympl-0.9.3-foss-2023a.eb:
       options:
         from-pr: 20126
+  - OpenJPEG-2.5.0-GCCcore-12.3.0.eb

easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-4.9.0-2023b.yml

@@ -49,3 +49,8 @@ easyconfigs:
   - libspatialindex-1.9.3-GCCcore-13.2.0.eb:
       options:
         from-pr: 19922
+  - LittleCMS-2.15-GCCcore-13.2.0.eb
+  - giflib-5.2.1-GCCcore-13.2.0.eb
+  - OpenJPEG-2.5.0-GCCcore-13.2.0.eb
+  - libwebp-1.3.2-GCCcore-13.2.0.eb
+

install_apptainer_ubuntu.sh

@@ -5,8 +5,13 @@ set -e
 # see https://github.com/apptainer/singularity/issues/5390#issuecomment-899111181
 sudo apt-get install alien
 alien --version
-apptainer_rpm=$(curl --silent -L https://dl.fedoraproject.org/pub/epel/8/Everything/x86_64/Packages/a/ | grep 'apptainer-[0-9]' | sed 's/.*\(apptainer[0-9._a-z-]*.rpm\).*/\1/g')
-curl -OL https://dl.fedoraproject.org/pub/epel/8/Everything/x86_64/Packages/a/${apptainer_rpm}
+# stick to Apptainer < 1.3.0 by downloading from EPEL 8.8 archive,
+# since CI workflow for testing scripts hangs/fails when using Apptainer 1.3.0
+# cfr. https://github.com/EESSI/software-layer/pull/514
+epel_subdir="pub/epel/8"
+epel_subdir="pub/archive/epel/8.8"
+apptainer_rpm=$(curl --silent -L https://dl.fedoraproject.org/${epel_subdir}/Everything/x86_64/Packages/a/ | grep 'apptainer-[0-9]' | sed 's/.*\(apptainer[0-9._a-z-]*.rpm\).*/\1/g')
+curl -OL https://dl.fedoraproject.org/${epel_subdir}/Everything/x86_64/Packages/a/${apptainer_rpm}
 sudo alien -d ${apptainer_rpm}
 sudo apt install ./apptainer*.deb
 apptainer --version