From 2914c0d2363944c734504871ddee901a9b7e4c99 Mon Sep 17 00:00:00 2001
From: Nicolas Richart <nicolas.richart@epfl.ch>
Date: Fri, 26 Jul 2024 21:42:45 +0200
Subject: [PATCH] cleaning compilers installations
---
ci/install_compilers.sh | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/ci/install_compilers.sh b/ci/install_compilers.sh
index 46e19e0..3c5547b 100755
--- a/ci/install_compilers.sh
+++ b/ci/install_compilers.sh
@@ -131,10 +131,21 @@ jq -Mrc '
| .system_arch as $arch
| .compilers
| to_entries
+ | map(select(.value.constraint == null))
| map(" - compiler_\(.key): [\(.value.compiler)@\(.value.version) target=\(env.target)]")
| .[]
' ${STACK_CONFIG} >> ${SPACK_SYSTEM_CONFIG_PATH}/compiler_definitions.yaml
+jq -Mrc '
+.stack
+ | .system_arch as $arch
+ | .compilers
+ | to_entries
+ | map(select(.value.constraint != null))
+ | map(" - compiler_\(.key): []\n - when: \(.value.constraint)\n compiler_\(.key): [\(.value.compiler)@\(.value.version) target=\(env.target)]")
+ | .[]
+' ${STACK_CONFIG} >> ${SPACK_SYSTEM_CONFIG_PATH}/compiler_definitions.yaml
+
cat ${SPACK_SYSTEM_CONFIG_PATH}/compiler_definitions.yaml
#yq -y -s ".[0].spack.definitions = .[1].definitions + .[0].spack.definitions | .[0]" ${SPACK_SYSTEM_CONFIG_PATH}/spack.yaml ${SPACK_SYSTEM_CONFIG_PATH}/compiler_definitions.yaml > ${SPACK_SYSTEM_CONFIG_PATH}/spack.yaml.new
--
GitLab