From f443875adddd74754bb477b8468ece7792e41e57 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Thu, 4 May 2023 16:57:38 +0000
Subject: [PATCH] feat: use eic-spack tag for reproducibility
---
.gitlab-ci.yml | 6 ++++--
containers/jug/dev.Dockerfile | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 24c5efc2b..6cf83d0af 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,6 +9,7 @@ variables:
## Spack organization and repository, e.g. spack/spack
SPACK_ORGREPO: "spack/spack"
## Spack github version, e.g. v0.18.1 or commit hash
+ ## note: nightly builds will use e.g. releases/v0.19
SPACK_VERSION: "v0.19.2"
## Space-separated list of spack cherry-picks
SPACK_CHERRYPICKS: >
@@ -75,8 +76,9 @@ variables:
## EIC spack organization and repository, e.g. eic/eic-spack
EICSPACK_ORGREPO: "eic/eic-spack"
- ## EIC spack github version, e.g. v0.18 branch, v0.18.1 tag, or commit hash
- EICSPACK_VERSION: "v0.19"
+ ## EIC spack github version, e.g. v0.19.7 or commit hash
+ ## note: nightly builds will use e.g. releases/v0.19
+ EICSPACK_VERSION: "v0.19.0"
## Space-separated list of eic-spack cherry-picks
EICSPACK_CHERRYPICKS: "f892e2b5d7ea9d1f2e43741499e899ce21dd3d5a"
## Ref: https://github.com/eic/eic-spack/commit/[hash]
diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile
index 9b9c786e5..e866d27ad 100644
--- a/containers/jug/dev.Dockerfile
+++ b/containers/jug/dev.Dockerfile
@@ -26,7 +26,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=${TARGETPLATFORM}
## Setup spack
ENV SPACK_ROOT=/opt/spack
ARG SPACK_ORGREPO="spack/spack"
-ARG SPACK_VERSION="develop"
+ARG SPACK_VERSION="releases/v0.19"
ARG SPACK_CHERRYPICKS=""
ADD https://api.github.com/repos/${SPACK_ORGREPO}/commits/${SPACK_VERSION} /tmp/spack.json
RUN git clone https://github.com/${SPACK_ORGREPO}.git ${SPACK_ROOT} \
--
GitLab