diff options
| author | Harmen Stoppels <me@harmenstoppels.nl> | 2023-10-27 09:43:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-27 09:43:01 +0200 |
| commit | 51275df0b13da8bef1db50d2451c741bfee292bf (patch) | |
| tree | adb427f6544d218714d23995c1a6a5f6d235feb4 /share | |
| parent | af13d16c2c2fda32e47f7300b31d805df64f8581 (diff) | |
| download | spack-51275df0b13da8bef1db50d2451c741bfee292bf.tar.gz spack-51275df0b13da8bef1db50d2451c741bfee292bf.tar.bz2 spack-51275df0b13da8bef1db50d2451c741bfee292bf.tar.xz spack-51275df0b13da8bef1db50d2451c741bfee292bf.zip | |
ci: spack compiler find should list extra config scopes (#40727)
otherwise it detected pre-configured compilers in an potentially different way.
Diffstat (limited to 'share')
| -rw-r--r-- | share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml index 579153bdfd..e5475a7bdc 100644 --- a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml +++ b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml @@ -140,8 +140,13 @@ default: - spack --version - cd share/spack/gitlab/cloud_pipelines/stacks/${SPACK_CI_STACK_NAME} - spack env activate --without-view . - - spack compiler find - export SPACK_CI_CONFIG_ROOT="${SPACK_ROOT}/share/spack/gitlab/cloud_pipelines/configs" + - spack + --config-scope "${SPACK_CI_CONFIG_ROOT}" + --config-scope "${SPACK_CI_CONFIG_ROOT}/${SPACK_TARGET_PLATFORM}" + --config-scope "${SPACK_CI_CONFIG_ROOT}/${SPACK_TARGET_PLATFORM}/${SPACK_TARGET_ARCH}" + ${CI_STACK_CONFIG_SCOPES} + compiler find - spack python -c "import os,sys; print(os.path.expandvars(sys.stdin.read()))" < "${SPACK_CI_CONFIG_ROOT}/${PIPELINE_MIRROR_TEMPLATE}" > "${SPACK_CI_CONFIG_ROOT}/mirrors.yaml" - spack config add -f "${SPACK_CI_CONFIG_ROOT}/mirrors.yaml" |