Skip to content

Commit dc18b1b

Browse files
committed
Merge branch 'eessi-2023.06-gentoo-2949284' of https://github.com/trz42/compatibility-layer into eessi-2023.06-gentoo-2949284
2 parents 970e6be + c0bec57 commit dc18b1b

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

ansible/playbooks/roles/compatibility_layer/defaults/main.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@ prefix_mask_packages: |
2626
# stick to GCC 9.x; using a too recent compiler in the compat layer complicates stuff in the software layer,
2727
# see for example https://github.com/EESSI/software-layer/issues/151
2828
>=sys-devel/gcc-10
29-
# see https://github.com/EESSI/software-layer/issues/257
30-
# and https://github.com/EESSI/software-layer/issues/258
31-
<dev-libs/openssl-3
29+
# mask OpenSSL 3.x, stick to OpenSSL 1.1.x for now to avoid problems with:
30+
# - older versions of Rust (see https://github.com/EESSI/software-layer/issues/257)
31+
# - older versions of cryptograhy in Python (see https://github.com/EESSI/software-layer/issues/258)
32+
>=dev-libs/openssl-3
3233
prefix_unmask_packages: |
3334
# unmask older GCC to make it installable
3435
=sys-devel/gcc-9*

bot/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ host_arch=$(uname -m)
8181
eessi_arch=${cpu_target_arch:-${host_arch}}
8282
eessi_os=linux
8383
job_version=$(cfg_get_value "repository" "repo_version")
84-
eessi_version=${job_version:-2023.04}
84+
eessi_version=${job_version:-2023.06}
8585
job_repo=$(cfg_get_value "repository" "repo_name")
8686
eessi_repo=${job_repo:-pilot.eessi-hpc.org}
8787
tar_topdir=/cvmfs/${eessi_repo}/versions

install_compatibility_layer.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ REPOSITORY="pilot.eessi-hpc.org"
1010
RESUME=
1111
RETAIN_TMP=0
1212
STORAGE=
13-
VERSION=2023.04
13+
VERSION=2023.06
1414
VERBOSE=
1515

1616
display_help() {

0 commit comments

Comments
 (0)