From 0507b24e9727d5b78694bcc2094276a3c3bdce8b Mon Sep 17 00:00:00 2001
From: Nicolas Richart <nicolas.richart@epfl.ch>
Date: Sun, 28 Jul 2024 01:00:01 +0200
Subject: [PATCH] Changing require to avoid multiple tk
---
ci/setup_spack.sh | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/ci/setup_spack.sh b/ci/setup_spack.sh
index 8ce4781..cbaa200 100755
--- a/ci/setup_spack.sh
+++ b/ci/setup_spack.sh
@@ -91,16 +91,31 @@ echo "packages:" > ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml
export system_compiler=$(jq -Mrc '
.stack
- | .system_arch as $arch
| .system_compiler
| to_entries
| .[].value
- | "\(.compiler)@\(.version) \($arch)"
+ | "\(.compiler)@\(.version)"
' ${STACK_CONFIG})
+export system_arch=$(jq -Mrc '
+.stack.system_arch
+' ${STACK_CONFIG})
+
+# cat <<EOF >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml
+# all:
+# prefer:
+# EOF
+
+# jq -Mrc '
+# .stack.system_packages
+# | map(" - spec: \"^\(.)%\(env.system_compiler)\"\n when: \"%nvhpc ^\(.)\"")
+# | .[]
+# ' ${STACK_CONFIG} >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml
+
+
jq -Mrc '
.stack.system_packages
- | map(" \(.):\n require:\n - spec: \"%\(env.system_compiler)\"")
+ | map(" \(.):\n require:\n - \"%\(env.system_compiler)\"\n - \"\(env.system_arch)\"")
| .[]
' ${STACK_CONFIG} >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml
--
GitLab