From 207adb9be00efd71548938416bb0aa63b38ee981 Mon Sep 17 00:00:00 2001
From: Nicolas Richart <nicolas.richart@epfl.ch>
Date: Mon, 27 May 2024 21:29:19 +0200
Subject: [PATCH] Typo in version plus revert variable
---
.gitlab-ci.yml | 2 +-
stacks/pinot-noir/config.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 216260d..f818519 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,7 +43,7 @@ variables:
variables:
COMMAND_OPTIONS_SBATCH: ${slurm_options}
STACK_CONFIG: ${CI_PROJECT_DIR}/stacks/${stack}/config.json
- STACK_LOCATION: "/stack"
+ STACK_LOCATION: $(jq -r .stack.mount_point ${STACK_CONFIG})
APPTAINER_EXEC_OPTIONS: ${apptainer_options} --bind ${BUILDCACHE}:/buildcache:rw --bind ${CI_PROJECT_DIR}:${STACK_LOCATION}
SPACK_USER_CACHE_PATH: "/tmp/spack_cache_${CI_JOB_ID}"
SPACK_USER_CONFIG_PATH: "/tmp/spack_user_${CI_JOB_ID}"
diff --git a/stacks/pinot-noir/config.json b/stacks/pinot-noir/config.json
index 35b3d52..5aa764a 100644
--- a/stacks/pinot-noir/config.json
+++ b/stacks/pinot-noir/config.json
@@ -1,6 +1,6 @@
{
"spack": {
- "version": "0.22.0",
+ "version": "v0.22.0",
"repos": {
"scitas-externals": {
"url": "https://gitlab.epfl.ch/SCITAS/software-stack/spack-repo-externals.git",
--
GitLab