Skip to content

Commit

Permalink
Rollup merge of #124630 - Kobzol:yaml-anchor, r=pietroalbini
Browse files Browse the repository at this point in the history
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``
  • Loading branch information
matthiaskrgr authored May 3, 2024
2 parents 1ff247c + 2245630 commit 56b2989
Showing 1 changed file with 13 additions and 10 deletions.
23 changes: 13 additions & 10 deletions src/ci/github-actions/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 56b2989

Please sign in to comment.