upgrade from spack 0.20.1 to 0.20.3

LIHPC-Computational-Geometry · Aug 3, 2024 · 568bd57 · 568bd57
1 parent 58b67bc
commit 568bd57
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/build_spack.sh b/build_spack.sh
@@ -1,6 +1,6 @@
 #==========================================
 # First get a spack release
-git clone --depth=1 -b v0.20.1  https://github.com/spack/spack.git
+git clone --depth=1 -b v0.20.3  https://github.com/spack/spack.git
 #==========================================
 # can be mandatory if you have already used spack on your computer
 # delete the .spack directory in the home of the user 
@@ -15,8 +15,6 @@ git clone https://github.com/LIHPC-Computational-Geometry/spack_recipes.git
 # Optionnal: modifying the install_tree variable to make it shorter and more human readable;
 # the HASH part in install directory names is removed which can lead to collisions.
 # The spack/etc/spack/defaults/config.yaml file can be modified by hand
-# - in spack version 0.19.2
-#sed -i 's#"${ARCHITECTURE}/${COMPILERNAME}-${COMPILERVER}/${PACKAGE}-${VERSION}-${HASH}"#"${PACKAGE}"#g' spack/etc/spack/defaults/config.yaml
 # - in spack version 0.20.1
 #sed -i 's#"{architecture}/{compiler.name}-{compiler.version}/{name}-{version}-{hash}"#"{name}"#g' spack/etc/spack/defaults/config.yaml
 
@@ -75,7 +73,7 @@ cat magix3d/spack-build-env.txt  | grep CMAKE_PREFIX_PATH | awk -F "=" {'print $
 
 # Note: I have issues building the doc this way, I guess other variables from spack-build-env.txt
 # are required. In this case -DWITH_DOC:BOOL=OFF can be specified
-cat gmds/spack-configure-args.txt
+cat magix3d/spack-configure-args.txt
 
 #==========================================
 # testing the install

diff --git a/dockerfiles/Dockerfile.spack-gmds b/dockerfiles/Dockerfile.spack-gmds
@@ -1,7 +1,7 @@
 #============== OS LAYER ==================
 FROM ubuntu:22.04
 #==========================================
-ARG SPACK_VERSION=0.20.1
+ARG SPACK_VERSION=0.20.3
 # METADATA OF THE IMAGE
 LABEL description="GMDS image built with spack" \
       version.ubuntu="22.04" \

diff --git a/dockerfiles/Dockerfile.spack-gmds-macos b/dockerfiles/Dockerfile.spack-gmds-macos
@@ -1,7 +1,7 @@
 #============== OS LAYER ==================
 FROM sickcodes/docker-osx
 #==========================================
-ARG SPACK_VERSION=0.20.1
+ARG SPACK_VERSION=0.20.3
 # METADATA OF THE IMAGE
 LABEL description="GMDS image built with spack for macos" \
       version.spack=${SPACK_VERSION}

diff --git a/dockerfiles/Dockerfile.spack-magix3d b/dockerfiles/Dockerfile.spack-magix3d
@@ -3,7 +3,7 @@
 # Ubuntu 22.04 allows to execute glxgears in a docker container
 FROM ubuntu:22.04
 #==========================================
-ARG SPACK_VERSION=0.20.1
+ARG SPACK_VERSION=0.20.3
 # METADATA OF THE IMAGE
 LABEL description="Magix3d image built with spack" \
       version.ubuntu="22.04" \