From c73f069d596d2393cdca9c666d373aacd3977111 Mon Sep 17 00:00:00 2001 From: Eleni Mathioulaki <emathioulaki@athenarc.gr> Date: Mon, 15 Apr 2024 13:21:37 +0300 Subject: [PATCH] feat: switch to using EBRAINS Spack fork --- install_spack_env.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/install_spack_env.sh b/install_spack_env.sh index 86e62145..70349615 100644 --- a/install_spack_env.sh +++ b/install_spack_env.sh @@ -13,6 +13,9 @@ EBRAINS_REPO=$3 # location of ebrains-spack-builds repository EBRAINS_SPACK_ENV=$4 # name of EBRAINS Spack environment to be created/updated UPSTREAM_INSTANCE=$5 # path to Spack instance to use as upstream (optional) +SPACK_REPO=https://gitlab.ebrains.eu/ri/tech-hub/platform/esd/spack.git +SPACK_VERSION_EBRAINS=${SPACK_VERSION}_ebrains24.04 + # specify location of .spack dir (by default in ~) # this is where cache and configuration settings are stored export SPACK_USER_CACHE_PATH=$INSTALLATION_ROOT/spack/.spack @@ -24,7 +27,7 @@ export SYSTEMNAME=${SYSTEMNAME:-${HPC_SYSTEM:-$BSC_MACHINE}} # initial setup: clone spack if spack dir doesn't already exist if [ ! -d $INSTALLATION_ROOT/spack ] then - git clone --depth 1 -c advice.detachedHead=false -c feature.manyFiles=true --branch $SPACK_VERSION https://github.com/spack/spack $INSTALLATION_ROOT/spack + git clone --depth 1 -c advice.detachedHead=false -c feature.manyFiles=true --branch $SPACK_VERSION_EBRAINS $SPACK_REPO $INSTALLATION_ROOT/spack # SPACK PATCH: the post-build logs on install-time-test-logs.txt gets ovewritten by the post-install logs. # quick fix for that: (TODO: investigate more and open PR) sed -i "s/self.file_like, \"w\"/self.file_like, \"a\"/g" $INSTALLATION_ROOT/spack/lib/spack/llnl/util/tty/log.py -- GitLab