diff --git a/ci/setup_spack.sh b/ci/setup_spack.sh index 8ce478151f1201b22841cc1dd0c642274793f026..cbaa200f92444dbf7bad98514f53f67a2f72636f 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