From 2f24fbd8233f17e83c741c76c9662007d0d79393 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Sat, 6 Aug 2022 01:25:48 +0000
Subject: [PATCH] fix: remove spack repo copy in jug_dev
---
.gitlab-ci.yml | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6e09f283c..2d935b822 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -340,11 +340,10 @@ jug_dev:default:
## calculate a hash based on the spack.yaml file and the spack directory
## and use this spack as a docker variable to force a rebuild when there
## is a change (versus rerun from cache)
- - PACKAGE_HASH=$(tar cf - spack* | sha1sum | head -c40)
- - echo "PACKAGE_HASH= ${PACKAGE_HASH}"
- ## move spack directory and spack.yaml into the container build directory
- - cp -r spack containers/jug
- - cp -r spack.yaml containers/jug/spack/spack.yaml
+ - PACKAGE_HASH=$(sha1sum spack.yaml | head -c40)
+ - echo "PACKAGE_HASH=${PACKAGE_HASH}"
+ ## move spack.yaml into the container build directory
+ - cp -r spack.yaml containers/jug
- CACHE_FLAG=""
- |
if [ $FORCE_NOCACHE = 1 ]; then
--
GitLab