From 27ebb399bd1d28f6424097d5fce256e39e9ab492 Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Sun, 30 Apr 2023 21:24:50 +0000
Subject: [PATCH] fix: set extensible target=$arch in site config
---
.gitlab-ci.yml | 2 ++
containers/jug/dev.Dockerfile | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b852de81b..c104797b4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,6 +40,7 @@ variables:
0a952f8b7bf6f70009dd5821bccbaf9170c73d07
f050b1cf7835fd31992b020e1061c52294ff7330
a419ffcf501134faed24253ccc83e6c71f9659f9
+ c3e41153ac92f6ef92414024a8386d4ceec2615c
## Ref: https://github.com/spack/spack/commit/[hash]
## [hash]: [description]
## b5ef5c2eb5145020f9de1bcb964626ce6ac2d02e: geant4: version bumps for Geant4 11.1.0
@@ -70,6 +71,7 @@ variables:
## 0a952f8b7bf6f70009dd5821bccbaf9170c73d07: docs updates for spack env depfile
## f050b1cf7835fd31992b020e1061c52294ff7330: depfile: variable with all identifiers
## a419ffcf501134faed24253ccc83e6c71f9659f9: osg-ca-certs: igtf link should point to version, not 'current'
+ ## c3e41153ac92f6ef92414024a8386d4ceec2615c: Package requirements: allow single specs in requirement lists
## EIC spack organization and repository, e.g. eic/eic-spack
EICSPACK_ORGREPO: "eic/eic-spack"
diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile
index 39c69924a..662765722 100644
--- a/containers/jug/dev.Dockerfile
+++ b/containers/jug/dev.Dockerfile
@@ -44,12 +44,12 @@ RUN git clone https://github.com/${SPACK_ORGREPO}.git ${SPACK_ROOT} \
SHELL ["docker-shell"]
ARG jobs=64
-RUN declare -A arch=( \
+RUN declare -A target=( \
["linux/amd64"]="x86_64" \
["linux/arm64"]="aarch64" \
) \
- && arch=${arch[${TARGETPLATFORM}]} \
- && spack config --scope site add "packages:all:require:arch=${arch}" \
+ && target=${target[${TARGETPLATFORM}]} \
+ && spack config --scope site add "packages:all:require:[target=${target}]" \
&& spack config blame packages \
&& spack config --scope site add "config:suppress_gpg_warnings:true" \
&& spack config --scope site add "config:build_jobs:${jobs}" \
--
GitLab