Skip to content

Commit 56b2989

Browse files
authored
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``
2 parents 1ff247c + 2245630 commit 56b2989

File tree

1 file changed

+13
-10
lines changed

1 file changed

+13
-10
lines changed

src/ci/github-actions/jobs.yml

+13-10
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,17 @@ runners:
3636
os: [ self-hosted, ARM64, linux ]
3737

3838
envs:
39+
env-x86_64-apple-tests: &env-x86_64-apple-tests
40+
SCRIPT: ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc --skip tests/run-make-fulldeps
41+
RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc
42+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
43+
MACOSX_DEPLOYMENT_TARGET: 10.12
44+
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
45+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
46+
NO_LLVM_ASSERTIONS: 1
47+
NO_DEBUG_ASSERTIONS: 1
48+
NO_OVERFLOW_CHECKS: 1
49+
3950
production:
4051
&production
4152
DEPLOY_BUCKET: rust-lang-ci2
@@ -272,16 +283,8 @@ auto:
272283
<<: *job-macos-xl
273284

274285
- image: x86_64-apple-1
275-
env: &env-x86_64-apple-tests
276-
SCRIPT: ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc --skip tests/run-make-fulldeps
277-
RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc
278-
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
279-
MACOSX_DEPLOYMENT_TARGET: 10.12
280-
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
281-
SELECT_XCODE: /Applications/Xcode_14.3.1.app
282-
NO_LLVM_ASSERTIONS: 1
283-
NO_DEBUG_ASSERTIONS: 1
284-
NO_OVERFLOW_CHECKS: 1
286+
env:
287+
<<: *env-x86_64-apple-tests
285288
<<: *job-macos-xl
286289

287290
- image: x86_64-apple-2

0 commit comments

Comments
 (0)