From a116f1fd0190bbbb1fabdda4ac3d2b87dfac083f Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Sat, 11 May 2024 23:30:29 +0000
Subject: [PATCH] fix: bring down the --no-cache hammer on all builds; disable
{dbg,prod}
---
.gitlab-ci.yml | 20 ++++++++++----------
containers/jug/dev.Dockerfile | 2 --
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a464f2e94..6999aa94b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,7 +31,7 @@ variables:
NIGHTLY_TAG: "nightly"
## Additional options for docker build (e.g. --no-cache)
- BUILD_OPTIONS: ""
+ BUILD_OPTIONS: "--no-cache"
## Version to be set by external trigger
VERSION: ""
@@ -234,15 +234,15 @@ status:pending:
base:
parallel:
matrix:
- - BASE_IMAGE: debian:testing-slim
- BUILD_IMAGE: debian_testing_base
- PLATFORM: linux/amd64,linux/arm64/v8
+# - BASE_IMAGE: debian:testing-slim
+# BUILD_IMAGE: debian_testing_base
+# PLATFORM: linux/amd64,linux/arm64/v8
- BASE_IMAGE: debian:stable-slim
BUILD_IMAGE: debian_stable_base
- PLATFORM: linux/amd64,linux/arm64/v8
- - BASE_IMAGE: ubuntu:22.04
- BUILD_IMAGE: ubuntu_base
- PLATFORM: linux/amd64,linux/arm64/v8
+ PLATFORM: linux/amd64
+# - BASE_IMAGE: ubuntu:22.04
+# BUILD_IMAGE: ubuntu_base
+# PLATFORM: linux/amd64,linux/arm64/v8
# - BASE_IMAGE: intel/oneapi-hpckit:2022.3.0-devel-ubuntu20.04
# BUILD_IMAGE: oneapi_base
# PLATFORM: linux/amd64
@@ -280,9 +280,9 @@ jug_dev:
BUILD_IMAGE: jug_
PLATFORM: linux/amd64
ENV:
- - dbg
+# - dbg
- dev
- - prod
+# - prod
# - BUILD_TYPE:
# - default
# - nightly
diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile
index 0ce893834..b66e7b458 100644
--- a/containers/jug/dev.Dockerfile
+++ b/containers/jug/dev.Dockerfile
@@ -150,7 +150,6 @@ export CCACHE_DIR=/ccache
source ${SPACK_ROOT}/share/spack/setup-env.sh
mkdir -p /var/cache/spack/blobs/sha256/
find /var/cache/spack/blobs/sha256/ -ignore_readdir_race -atime +7 -delete
-spack buildcache update-index eics3rw
echo -e "\n view: false" >> ${SPACK_ENV}/spack.yaml
spack env activate --dir ${SPACK_ENV}
spack concretize --fresh --force
@@ -182,7 +181,6 @@ RUN --mount=type=cache,target=/ccache,id=${TARGETPLATFORM} \
<<EOF
set -e
export CCACHE_DIR=/ccache
-spack buildcache update-index eics3rw
spack env activate --dir ${SPACK_ENV}
if [ "${EDM4EIC_VERSION}" != "8aeb507f93a93257c99985efbce0ec1371e0b331" ] ; then
export EDM4EIC_VERSION=$(jq -r .sha /tmp/edm4eic.json)
--
GitLab