From 4480488bc234173d41462cfd07e9c11f2dfe513e Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Sun, 14 Jul 2024 22:12:47 +0000
Subject: [PATCH] fix: ensure eicweb and ghcr oci buildcache are used for fetch
too
---
mirrors.yaml.in | 8 ++++++++
spack-environment/packages.yaml | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/mirrors.yaml.in b/mirrors.yaml.in
index e1a4e12c6..62c99cc7f 100644
--- a/mirrors.yaml.in
+++ b/mirrors.yaml.in
@@ -2,6 +2,10 @@ mirrors:
eicweb:
url: oci://${CI_REGISTRY}/${CI_PROJECT_PATH}/spack-${SPACK_VERSION}
signed: false
+ fetch:
+ access_pair:
+ - ${CI_REGISTRY_USER}
+ - ${CI_REGISTRY_PASSWORD}
push:
access_pair:
- ${CI_REGISTRY_USER}
@@ -9,6 +13,10 @@ mirrors:
ghcr:
url: oci://ghcr.io/eic/spack-${SPACK_VERSION}
signed: false
+ fetch:
+ access_pair:
+ - ${GITHUB_REGISTRY_USER}
+ - ${GITHUB_REGISTRY_TOKEN}
push:
access_pair:
- ${GITHUB_REGISTRY_USER}
diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml
index e77e8f528..9e5ae5202 100644
--- a/spack-environment/packages.yaml
+++ b/spack-environment/packages.yaml
@@ -354,7 +354,7 @@ packages:
- '@0.30.0'
qt:
require:
- - '@5.15.11'
+ - '@5.15.12'
- +opengl
root:
require:
--
GitLab