Skip to content

Commit

Permalink
Merge branch 'nessi.no-2023.06' into nessi.no-2023.06-SRA-Toolkit/3.0…
Browse files Browse the repository at this point in the history
….3-gompi/2022a
  • Loading branch information
TopRichard authored Jan 10, 2024
2 parents d47cbe8 + 43e4262 commit ce24ed4
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test_eessi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
EESSI_VERSION:
- 2023.06
EESSI_SOFTWARE_SUBDIR:
- aarch64/generic
# - aarch64/generic
- x86_64/amd/zen2
- x86_64/intel/broadwell
- x86_64/intel/cascadelake
# - x86_64/intel/cascadelake
- x86_64/intel/skylake_avx512
- x86_64/generic
EASYSTACK_FILE:
Expand Down
10 changes: 9 additions & 1 deletion eessi-2023.06-eb-4.8.1-2022a.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ easyconfigs:
- gzip-1.12-GCCcore-11.3.0.eb
- lz4-1.9.3-GCCcore-11.3.0.eb
- zstd-1.5.2-GCCcore-11.3.0.eb
- Pillow-9.1.1-GCCcore-11.3.0.eb:
# avoid that hardcoded paths like /usr/include are used in build commands
options:
from-pr: 18881
- Boost.Python-1.79.0-GCC-11.3.0.eb
- netCDF-4.9.0-gompi-2022a.eb:
# use updated CMakeMake easyblock to avoid that -DCMAKE_SKIP_RPATH=ON is used, which breaks the netCDF test step
Expand Down Expand Up @@ -55,4 +59,8 @@ easyconfigs:
# Uses a custom hook since has zlib as dependency which has hard coded header and library path within Pillow code.
options:
from-pr: 18881
- SRA-Toolkit-3.0.3-gompi-2022a.eb
- ParaView-5.10.1-foss-2022a-mpi.eb:
options:
download-timeout: 1000
- ASE-3.22.1-foss-2022a.eb
- SRA-Toolkit-3.0.3-gompi-2022a.eb
3 changes: 3 additions & 0 deletions eessi-2023.06-eb-4.8.1-system.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
easyconfigs:
# wraps around Java/11.0.20
- Java-11.eb
- EasyBuild-4.8.2.eb:
options:
from-pr: 19105
2 changes: 2 additions & 0 deletions eessi-2023.06-eb-4.8.2-2022a.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
easyconfigs:
- CDO-2.0.6-gompi-2022a.eb

0 comments on commit ce24ed4

Please sign in to comment.