resolve conflicts

EESSI · Sep 7, 2023 · 322a7b6 · 322a7b6
2 parents 65b6e9a + e3bfcdf
commit 322a7b6
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/.github/workflows/test_eessi.yml b/.github/workflows/test_eessi.yml
@@ -26,6 +26,7 @@ jobs:
         - eessi-2023.06-eb-4.7.2-2022a.yml
         - eessi-2023.06-eb-4.7.2-2022b.yml
         - eessi-2023.06-eb-4.7.2-system.yml
+        - eessi-2023.06-eb-4.8.0-system.yml
         - eessi-2023.06-eb-4.8.0-2021b.yml
     steps:
         - name: Check out software-layer repository

diff --git a/create_tarball.sh b/create_tarball.sh
@@ -52,7 +52,7 @@ if [ -d ${pilot_version}/software/${os}/${cpu_arch_subdir}/modules ]; then
     find ${pilot_version}/software/${os}/${cpu_arch_subdir}/modules -type l | grep -v '/\.wh\.' >> ${files_list}
     # module files and symlinks
     find ${pilot_version}/software/${os}/${cpu_arch_subdir}/modules/all -type f -o -type l \
-        | grep -v '/\.wh\.' | sed -e 's/.lua$//' | sed -e 's@.*/modules/all/@@g' | sort -u \
+        | grep -v '/\.wh\.' | grep -v '/\.modulerc\.lua' | sed -e 's/.lua$//' | sed -e 's@.*/modules/all/@@g' | sort -u \
         >> ${module_files_list}
 fi
 if [ -d ${pilot_version}/software/${os}/${cpu_arch_subdir}/software -a -r ${module_files_list} ]; then

diff --git a/eessi-2023.06-eb-4.7.2-2021a.yml b/eessi-2023.06-eb-4.7.2-2021a.yml
@@ -14,3 +14,13 @@ easyconfigs:
        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/18087
        options:                                  
          from-pr: 18087
+  - RapidJSON-1.1.0-GCCcore-10.3.0.eb:
+       # strip out hardcoded -march=native,
+       # see https://github.com/easybuilders/easybuild-easyconfigs/pull/18725
+       options:
+         from-pr: 18725
+  - Arrow-6.0.0-foss-2021a.eb:
+       # fix installation of pyarrow Python bindings
+       # see https://github.com/easybuilders/easybuild-easyconfigs/pull/18348
+       options:
+         from-pr: 18348
diff --git a/eessi-2023.06-eb-4.8.0-system.yml b/eessi-2023.06-eb-4.8.0-system.yml
@@ -0,0 +1,7 @@
+easyconfigs:
+  - Java-11.eb:
+      # patch Java binaries/libraries when using alternate sysroot to ensure correct glibc & co are picked up
+      # see https://github.com/easybuilders/easybuild-easyblocks/pull/2557
+      # + https://github.com/easybuilders/easybuild-easyblocks/pull/2995
+      options:
+        include-easyblocks-from-pr: 2995