diff --git a/ci/setup_spack.sh b/ci/setup_spack.sh index 2d7c3a48bd236e7da5560a2890b2d67a7bed83ed..ef4022d4c182fa4d84de196ce5422bdfb7b8f0c2 100755 --- a/ci/setup_spack.sh +++ b/ci/setup_spack.sh @@ -18,12 +18,6 @@ else fi git -C spack checkout $SPACK_VERSION -#cat > spack/etc/spack/config.yaml << EOF -#config: -# install_tree: -# root: ${STACK_LOCATION}/spack/opt/spack -#EOF - echo "Adding spack system config file" echo mkdir -p ${SPACK_SYSTEM_CONFIG_PATH} @@ -89,13 +83,15 @@ spack/bin/spack buildcache keys \ #spack/bin/spack buildcache update-index /buildcache +which jq +jq --version echo "Env: $environment" -target=$(jq -Mrc --arg env "$environment" ' +target=$(jq -Mrc --arg env "${environment}" ' .environments.[$env].target ' ${STACK_CONFIG}) -require=$(jq -Mrc --arg env "$environment" ' +require=$(jq -Mrc --arg env "${environment}" ' .environments.[$env] | if has("require") then .require