Skip to content

Commit 56e5725

Browse files
Auto merge of #146513 - madsmtm:apple-reenable-assertions, r=<try>
Re-enable assertions on macOS try-job: `*apple*`
2 parents 959b450 + b2c7b6b commit 56e5725

File tree

1 file changed

+4
-16
lines changed

1 file changed

+4
-16
lines changed

src/ci/github-actions/jobs.yml

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ auto:
412412
# macOS Builders #
413413
####################
414414

415-
- name: dist-x86_64-apple
415+
- name: dist-x86_64-apple-alt
416416
env:
417417
SCRIPT: >-
418418
./x.py dist bootstrap
@@ -431,14 +431,11 @@ auto:
431431
MACOSX_DEPLOYMENT_TARGET: 10.12
432432
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
433433
SELECT_XCODE: /Applications/Xcode_15.2.app
434-
NO_LLVM_ASSERTIONS: 1
435-
NO_DEBUG_ASSERTIONS: 1
436-
NO_OVERFLOW_CHECKS: 1
437434
DIST_REQUIRE_ALL_TOOLS: 1
438435
CODEGEN_BACKENDS: llvm,cranelift
439436
<<: *job-macos
440437

441-
- name: dist-apple-various
438+
- name: dist-apple-various-alt
442439
env:
443440
SCRIPT: ./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim,aarch64-apple-ios-macabi,x86_64-apple-ios-macabi
444441
# Mac Catalyst cannot currently compile the sanitizer:
@@ -449,12 +446,9 @@ auto:
449446
MACOSX_DEPLOYMENT_TARGET: 10.12
450447
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
451448
SELECT_XCODE: /Applications/Xcode_15.2.app
452-
NO_LLVM_ASSERTIONS: 1
453-
NO_DEBUG_ASSERTIONS: 1
454-
NO_OVERFLOW_CHECKS: 1
455449
<<: *job-macos
456450

457-
- name: dist-aarch64-apple
451+
- name: dist-aarch64-apple-alt
458452
env:
459453
SCRIPT: ./x.py dist bootstrap --include-default-paths --host=aarch64-apple-darwin --target=aarch64-apple-darwin
460454
RUST_CONFIGURE_ARGS: >-
@@ -471,14 +465,11 @@ auto:
471465
# supports the hardware.
472466
MACOSX_DEPLOYMENT_TARGET: 11.0
473467
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
474-
NO_LLVM_ASSERTIONS: 1
475-
NO_DEBUG_ASSERTIONS: 1
476-
NO_OVERFLOW_CHECKS: 1
477468
DIST_REQUIRE_ALL_TOOLS: 1
478469
CODEGEN_BACKENDS: llvm,cranelift
479470
<<: *job-macos
480471

481-
- name: aarch64-apple
472+
- name: aarch64-apple-alt
482473
env:
483474
SCRIPT: >
484475
./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin &&
@@ -493,9 +484,6 @@ auto:
493484
# supports the hardware, so only need to test it there.
494485
MACOSX_DEPLOYMENT_TARGET: 11.0
495486
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
496-
NO_LLVM_ASSERTIONS: 1
497-
NO_DEBUG_ASSERTIONS: 1
498-
NO_OVERFLOW_CHECKS: 1
499487
<<: *job-macos
500488

501489
######################

0 commit comments

Comments
 (0)