From 67141b739c84f272edb7abd52a06c545a656d736 Mon Sep 17 00:00:00 2001
From: Nicolas Richart <networms@gmail.ch>
Date: Mon, 17 Jun 2024 15:36:26 +0200
Subject: [PATCH] Rewrite of request for jq 1.16
---
ci/setup_spack.sh | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/ci/setup_spack.sh b/ci/setup_spack.sh
index b1663d7..3a5be85 100755
--- a/ci/setup_spack.sh
+++ b/ci/setup_spack.sh
@@ -83,19 +83,15 @@ spack/bin/spack buildcache keys \
#spack/bin/spack buildcache update-index /buildcache
-curl -L https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-amd64 -o /usr/bin/jq
-chmod +x /usr/bin/jq
-
-which jq
-jq --version
-echo "Env: $environment"
-
target=$(jq -Mrc --arg env "${environment}" '
.environments.[$env].target
' ${STACK_CONFIG})
-require=$(jq -Mrc --arg env "${environment}" '
- .environments.[$env]
+require=$(jq -Mrc --arg environment "${environment}" '
+ .environments
+ | to_entries
+ | map(select(.key==env.environment))
+ | .[].value
| if has("require") then
.require
| map(" - spec: \(.spec)\n when: \(.when)")
--
GitLab