diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-05-03 20:33:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-03 20:33:47 +0200 |
| commit | 56b2989d679130d4d5cfc10bb1840ac9c3617389 (patch) | |
| tree | a0d9c9d912653737beaaa98a2cdf0cf84cba7a5a | |
| parent | 1ff247c40484a8f3c4c3891273f4f9833cd53c00 (diff) | |
| parent | 22456309eae112e23f382b88729d00ac815a2c85 (diff) | |
| download | rust-56b2989d679130d4d5cfc10bb1840ac9c3617389.tar.gz rust-56b2989d679130d4d5cfc10bb1840ac9c3617389.zip | |
Rollup merge of #124630 - Kobzol:yaml-anchor, r=pietroalbini
CI: remove `env-x86_64-apple-tests` YAML anchor This PR removes the only remaining anchor in the definition of CI jobs. This anchor made it annoying to copy-paste the job e.g. to PR CI. Fixes: https://rust-lang.zulipchat.com/#narrow/stream/242791-t-infra/topic/How.20do.20you.20edit.20PR.20CI.20to.20test.20PR.20now.3F r? ``@pietroalbini``
| -rw-r--r-- | src/ci/github-actions/jobs.yml | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 1fabf889e38..42749f80653 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -36,6 +36,17 @@ runners: os: [ self-hosted, ARM64, linux ] envs: + env-x86_64-apple-tests: &env-x86_64-apple-tests + SCRIPT: ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc --skip tests/run-make-fulldeps + RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc + RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 + MACOSX_DEPLOYMENT_TARGET: 10.12 + MACOSX_STD_DEPLOYMENT_TARGET: 10.12 + SELECT_XCODE: /Applications/Xcode_14.3.1.app + NO_LLVM_ASSERTIONS: 1 + NO_DEBUG_ASSERTIONS: 1 + NO_OVERFLOW_CHECKS: 1 + production: &production DEPLOY_BUCKET: rust-lang-ci2 @@ -272,16 +283,8 @@ auto: <<: *job-macos-xl - image: x86_64-apple-1 - env: &env-x86_64-apple-tests - SCRIPT: ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc --skip tests/run-make-fulldeps - RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc - RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 - MACOSX_DEPLOYMENT_TARGET: 10.12 - MACOSX_STD_DEPLOYMENT_TARGET: 10.12 - SELECT_XCODE: /Applications/Xcode_14.3.1.app - NO_LLVM_ASSERTIONS: 1 - NO_DEBUG_ASSERTIONS: 1 - NO_OVERFLOW_CHECKS: 1 + env: + <<: *env-x86_64-apple-tests <<: *job-macos-xl - image: x86_64-apple-2 |