ci: use "strong preference" idiom for compilers (#41806)

to avoid duplication of conflicts / requirements in config
2023-12-21 12:50:35 +01:00 · 2023-12-21 12:50:35 +01:00 · e7f897f959
commit e7f897f959
parent 1aaab97a16
2 changed files with 5 additions and 2 deletions
--- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-rhel/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-cray-rhel/spack.yaml
@ -10,7 +10,8 @@ spack:

  packages:
    all:
-      require: '%cce'
+      require:
+      - any_of: ["%cce", "@:"]  # cce as a strong preference; not all packages support it
      compiler: [cce]
      providers:
        blas: [cray-libsci]
--- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml
@ -7,7 +7,9 @@ spack:

  packages:
    all:
-      require: '%oneapi target=x86_64_v3'
+      require:
+      - any_of: ["%oneapi", "@:"]  # oneapi as a strong preference; not all packages support it
+      - "target=x86_64_v3"
      providers:
        blas: [openblas]
        mpi: [mpich]