Skip to content

Commit bde75ee

Browse files
committed
Merge branch '2023.06-software.eessi.io' of github.com:EESSI/software-layer into software_rebuilds
2 parents 57d8b6f + b9d32f0 commit bde75ee

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

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

+1
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,4 @@ easyconfigs:
5252
- ipympl-0.9.3-foss-2023a.eb:
5353
options:
5454
from-pr: 20126
55+
- OpenJPEG-2.5.0-GCCcore-12.3.0.eb

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

+5
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,8 @@ easyconfigs:
4949
- libspatialindex-1.9.3-GCCcore-13.2.0.eb:
5050
options:
5151
from-pr: 19922
52+
- LittleCMS-2.15-GCCcore-13.2.0.eb
53+
- giflib-5.2.1-GCCcore-13.2.0.eb
54+
- OpenJPEG-2.5.0-GCCcore-13.2.0.eb
55+
- libwebp-1.3.2-GCCcore-13.2.0.eb
56+

install_apptainer_ubuntu.sh

+7-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,13 @@ set -e
55
# see https://github.com/apptainer/singularity/issues/5390#issuecomment-899111181
66
sudo apt-get install alien
77
alien --version
8-
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')
9-
curl -OL https://dl.fedoraproject.org/pub/epel/8/Everything/x86_64/Packages/a/${apptainer_rpm}
8+
# stick to Apptainer < 1.3.0 by downloading from EPEL 8.8 archive,
9+
# since CI workflow for testing scripts hangs/fails when using Apptainer 1.3.0
10+
# cfr. https://github.com/EESSI/software-layer/pull/514
11+
epel_subdir="pub/epel/8"
12+
epel_subdir="pub/archive/epel/8.8"
13+
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')
14+
curl -OL https://dl.fedoraproject.org/${epel_subdir}/Everything/x86_64/Packages/a/${apptainer_rpm}
1015
sudo alien -d ${apptainer_rpm}
1116
sudo apt install ./apptainer*.deb
1217
apptainer --version

0 commit comments

Comments
 (0)