diff options
| -rw-r--r-- | share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | share/spack/gitlab/cloud_pipelines/stacks/e4s-mac/spack.yaml | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml index 616c4b8de0..3bdbd2086a 100644 --- a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml +++ b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml @@ -200,7 +200,7 @@ e4s-mac-pr-generate: paths: - "${CI_PROJECT_DIR}/jobs_scratch_dir" tags: - - omicron + - lambda interruptible: true retry: max: 2 diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-mac/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-mac/spack.yaml index 6cfaae4a15..a97101f16f 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-mac/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-mac/spack.yaml @@ -15,7 +15,7 @@ spack: packages: all: - compiler: [apple-clang@13.0.0] + compiler: [apple-clang@13.1.6] target: [m1] definitions: @@ -24,7 +24,7 @@ spack: - ncurses - arch: - - '%apple-clang@13.0.0 target=m1' + - '%apple-clang@13.1.6 target=m1' specs: @@ -50,16 +50,18 @@ spack: - match: ['os=monterey'] runner-attributes: tags: - - omicron + - lambda broken-specs-url: "s3://spack-binaries/broken-specs" service-job-attributes: before_script: - - . "./share/spack/setup-env.sh" - - spack --version + - export SPACK_USER_CACHE_PATH=$(pwd)/.spack-user-cache + - export SPACK_USER_CONFIG_PATH=$(pwd)/.spack-user-config + - . "./share/spack/setup-env.sh" + - spack --version tags: - - omicron + - lambda cdash: build-group: E4S Mac |