From a38b6ef32fba1164f5e87a55f8b0bb03c1c5dc40 Mon Sep 17 00:00:00 2001
From: nicolas le goff <nicolas.le-goff@cea.fr>
Date: Thu, 29 Aug 2024 21:14:41 +0200
Subject: [PATCH] removed use of the gmds_temp branch

---
 build_spack_gmds.sh                     | 10 ++++------
 dockerfiles/Dockerfile.spack-gmds       |  6 +++---
 dockerfiles/Dockerfile.spack-gmds-macos |  6 +++---
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/build_spack_gmds.sh b/build_spack_gmds.sh
index 7536ce3..88dff5e 100755
--- a/build_spack_gmds.sh
+++ b/build_spack_gmds.sh
@@ -7,7 +7,7 @@ git clone --depth=1 -b v0.20.3  https://github.com/spack/spack.git
 # have a fresh start 
 #==========================================
 # get our recipes
-git clone --branch gmds_temp --depth=1 https://github.com/LIHPC-Computational-Geometry/spack_recipes.git
+git clone --depth=1 https://github.com/LIHPC-Computational-Geometry/spack_recipes.git
 #==========================================
 # modifying spack configuration
 #==========================================
@@ -16,15 +16,13 @@ git clone --branch gmds_temp --depth=1 https://github.com/LIHPC-Computational-Ge
 # 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
+# - in spack version 0.20.3
 #sed -i 's#"{architecture}/{compiler.name}-{compiler.version}/{name}-{version}-{hash}"#"{name}"#g' spack/etc/spack/defaults/config.yaml
 
 # to register our recipes; it assumes that spack_recipes and spack are located at
 # the same level. You can use the "spack repo add" commands instead of copying the repos.yaml file
-#spack repo add ./spack_recipes/meshing_repo
-#spack repo add ./spack_recipes/supersede_repo
+#spack repo add ./spack_recipes/meshing
+#spack repo add ./spack_recipes/meshing_supersede
 cp spack_recipes/config/repos.yaml spack/etc/spack/defaults/repos.yaml
 
 # Optionnal: the default tmpdir used to build is defined in spack/etc/spack/defaults/config.yaml
diff --git a/dockerfiles/Dockerfile.spack-gmds b/dockerfiles/Dockerfile.spack-gmds
index 6282492..d8eebc7 100644
--- a/dockerfiles/Dockerfile.spack-gmds
+++ b/dockerfiles/Dockerfile.spack-gmds
@@ -28,9 +28,9 @@ RUN git clone --depth=1 -b v${SPACK_VERSION} https://github.com/spack/spack.git
     sed -i 's#"{architecture}/{compiler.name}-{compiler.version}/{name}-{version}-{hash}"#"{name}"#g' spack/etc/spack/defaults/config.yaml
 #==========================================
 RUN source ./spack/share/spack/setup-env.sh && \
-    git clone --branch gmds_temp --depth=1 https://github.com/LIHPC-Computational-Geometry/spack_recipes.git &&\
-    spack repo add ./spack_recipes/meshing_repo &&\
-    spack repo add ./spack_recipes/supersede_repo &&\
+    git clone --depth=1 https://github.com/LIHPC-Computational-Geometry/spack_recipes.git &&\
+    spack repo add ./spack_recipes/meshing &&\
+    spack repo add ./spack_recipes/meshing_supersede &&\
     spack config --scope site add 'packages:all:target:[x86_64]' &&\
     spack compiler find &&\
     spack external find cmake
diff --git a/dockerfiles/Dockerfile.spack-gmds-macos b/dockerfiles/Dockerfile.spack-gmds-macos
index 630a6d9..94bc3bf 100644
--- a/dockerfiles/Dockerfile.spack-gmds-macos
+++ b/dockerfiles/Dockerfile.spack-gmds-macos
@@ -17,9 +17,9 @@ RUN git clone --depth=1 -b v${SPACK_VERSION} https://github.com/spack/spack.git
     sed -i 's#"{architecture}/{compiler.name}-{compiler.version}/{name}-{version}-{hash}"#"{name}"#g' spack/etc/spack/defaults/config.yaml
 #==========================================
 RUN source ./spack/share/spack/setup-env.sh && \
-    git clone --branch gmds_temp --depth=1 https://github.com/LIHPC-Computational-Geometry/spack_recipes.git &&\
-    spack repo add ./spack_recipes/meshing_repo &&\
-    spack repo add ./spack_recipes/supersede_repo &&\
+    git clone --depth=1 https://github.com/LIHPC-Computational-Geometry/spack_recipes.git &&\
+    spack repo add ./spack_recipes/meshing &&\
+    spack repo add ./spack_recipes/meshing_supersede &&\
     spack config --scope site add 'packages:all:target:[x86_64]' &&\
     spack compiler find &&\
     spack external find cmake