From 826f0f04bbae916ccd7e98237917d75f4271e40d Mon Sep 17 00:00:00 2001 From: Alan O'Cais Date: Wed, 12 Feb 2025 13:22:39 +0100 Subject: [PATCH 1/5] Rebuild R-bundle-CRAN-2023.12 to sync extensions between archs --- ...undle-CRAN-2023.12-rebuild-to-sync-exts-between-archs.eb | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 easystacks/software.eessi.io/2023.06/rebuilds/20250212-eb-4.9.4-R-bundle-CRAN-2023.12-rebuild-to-sync-exts-between-archs.eb diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20250212-eb-4.9.4-R-bundle-CRAN-2023.12-rebuild-to-sync-exts-between-archs.eb b/easystacks/software.eessi.io/2023.06/rebuilds/20250212-eb-4.9.4-R-bundle-CRAN-2023.12-rebuild-to-sync-exts-between-archs.eb new file mode 100644 index 0000000000..c8af97e1f5 --- /dev/null +++ b/easystacks/software.eessi.io/2023.06/rebuilds/20250212-eb-4.9.4-R-bundle-CRAN-2023.12-rebuild-to-sync-exts-between-archs.eb @@ -0,0 +1,6 @@ +# 2025.02.14 +# Rebuild R-bundle-CRAN to synchronise the extensions between archs. +# This is necessary because the Zen4 version was not built with the same EB +# version (and exts had changed) +easyconfigs: + - R-bundle-CRAN-2023.12-foss-2023a.eb From ad9483481ac760a3ca422004742ff96f453f0cc3 Mon Sep 17 00:00:00 2001 From: ocaisa Date: Wed, 12 Feb 2025 13:24:31 +0100 Subject: [PATCH 2/5] Update 20250212-eb-4.9.4-R-bundle-CRAN-2023.12-rebuild-to-sync-exts-between-archs.eb --- ...-R-bundle-CRAN-2023.12-rebuild-to-sync-exts-between-archs.eb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20250212-eb-4.9.4-R-bundle-CRAN-2023.12-rebuild-to-sync-exts-between-archs.eb b/easystacks/software.eessi.io/2023.06/rebuilds/20250212-eb-4.9.4-R-bundle-CRAN-2023.12-rebuild-to-sync-exts-between-archs.eb index c8af97e1f5..d60898ce60 100644 --- a/easystacks/software.eessi.io/2023.06/rebuilds/20250212-eb-4.9.4-R-bundle-CRAN-2023.12-rebuild-to-sync-exts-between-archs.eb +++ b/easystacks/software.eessi.io/2023.06/rebuilds/20250212-eb-4.9.4-R-bundle-CRAN-2023.12-rebuild-to-sync-exts-between-archs.eb @@ -1,4 +1,4 @@ -# 2025.02.14 +# 2025.02.12 # Rebuild R-bundle-CRAN to synchronise the extensions between archs. # This is necessary because the Zen4 version was not built with the same EB # version (and exts had changed) From 124499ff538096daf7eb803dc90957e63a533a5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bob=20Dr=C3=B6ge?= Date: Thu, 13 Feb 2025 12:57:50 +0100 Subject: [PATCH 3/5] change extension from .eb to .yml --- ...-R-bundle-CRAN-2023.12-rebuild-to-sync-exts-between-archs.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename easystacks/software.eessi.io/2023.06/rebuilds/{20250212-eb-4.9.4-R-bundle-CRAN-2023.12-rebuild-to-sync-exts-between-archs.eb => 20250212-eb-4.9.4-R-bundle-CRAN-2023.12-rebuild-to-sync-exts-between-archs.yml} (100%) diff --git a/easystacks/software.eessi.io/2023.06/rebuilds/20250212-eb-4.9.4-R-bundle-CRAN-2023.12-rebuild-to-sync-exts-between-archs.eb b/easystacks/software.eessi.io/2023.06/rebuilds/20250212-eb-4.9.4-R-bundle-CRAN-2023.12-rebuild-to-sync-exts-between-archs.yml similarity index 100% rename from easystacks/software.eessi.io/2023.06/rebuilds/20250212-eb-4.9.4-R-bundle-CRAN-2023.12-rebuild-to-sync-exts-between-archs.eb rename to easystacks/software.eessi.io/2023.06/rebuilds/20250212-eb-4.9.4-R-bundle-CRAN-2023.12-rebuild-to-sync-exts-between-archs.yml From bf8d74dab96c2d40e625e216cd797826cd5274e3 Mon Sep 17 00:00:00 2001 From: ocaisa Date: Thu, 13 Feb 2025 22:03:18 +0100 Subject: [PATCH 4/5] Alsolist modules directory when removing software --- EESSI-remove-software.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/EESSI-remove-software.sh b/EESSI-remove-software.sh index c35c7bc469..7624905523 100755 --- a/EESSI-remove-software.sh +++ b/EESSI-remove-software.sh @@ -137,6 +137,7 @@ if [ $EUID -eq 0 ]; then # these subdirs don't (and shouldn't) exist, but we need to do the ls anyway as a workaround, # so redirect to /dev/null and ignore the exit code ls ${app_subdirs} >& /dev/null || true + ls $(dirname ${app_module}) >& /dev/null || true done else fatal_error "Easystack file ${easystack_file} not found!" From ab18c6c745619c0eb76c21c8f2c07487f4d1a8c9 Mon Sep 17 00:00:00 2001 From: ocaisa Date: Wed, 19 Feb 2025 18:11:03 +0100 Subject: [PATCH 5/5] Revert ineffective rebuild change --- EESSI-remove-software.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/EESSI-remove-software.sh b/EESSI-remove-software.sh index 7624905523..c35c7bc469 100755 --- a/EESSI-remove-software.sh +++ b/EESSI-remove-software.sh @@ -137,7 +137,6 @@ if [ $EUID -eq 0 ]; then # these subdirs don't (and shouldn't) exist, but we need to do the ls anyway as a workaround, # so redirect to /dev/null and ignore the exit code ls ${app_subdirs} >& /dev/null || true - ls $(dirname ${app_module}) >& /dev/null || true done else fatal_error "Easystack file ${easystack_file} not found!"