From 3b3b6a3ef17afb409e38afdbc14325ec7e8a96f2 Mon Sep 17 00:00:00 2001
From: Nicolas Richart <nicolas.richart@epfl.ch>
Date: Thu, 25 Jan 2024 17:27:09 +0100
Subject: [PATCH] Change to develop to get include of definitions
---
.gitlab-ci.yml | 9 +--------
config.json | 2 +-
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2652b90..ac69757 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -98,20 +98,12 @@ spack:setup:
- 'echo "config: { install_tree: { root: /stack/spack/opt/spack } }" > /stack/spack/etc/config.yaml'
- - echo $SPACK_SYSTEM_CONFIG_PATH
-
- - spack/bin/spack config blame mirrors
- - spack/bin/spack config blame config
-
- |
if [ ! -d /buildcache/build_cache ]; then
spack/bin/spack gpg publish -d /buildcache
fi
- spack/bin/spack buildcache keys --install --trust
- spack/bin/spack buildcache update-index /buildcache
- - spack/bin/spack buildcache list --allarch
-
-
spack:install_compilers:
@@ -164,6 +156,7 @@ spack:concretize:
- .spack_cache
- .parallel_job
script:
+ - spack/bin/spack config blame definitions
- spack/bin/spack -e . concretize
needs:
- job: spack:install_compilers
diff --git a/config.json b/config.json
index f18db4e..402235a 100644
--- a/config.json
+++ b/config.json
@@ -1,6 +1,6 @@
{
"spack": {
- "version": "v0.21.1",
+ "version": "develop",
"repos": {
"scitas-externals": {
"url": "https://gitlab.epfl.ch/SCITAS/software-stack/spack-repo-externals.git",
--
GitLab