Skip to content

Commit beeae75

Browse files
Auto merge of #146513 - madsmtm:apple-reenable-assertions, r=<try>
Re-enable assertions on macOS try-job: `*apple*`
2 parents b50f345 + 2bdfca2 commit beeae75

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
@@ -437,7 +437,7 @@ auto:
437437
# macOS Builders #
438438
####################
439439

440-
- name: dist-x86_64-apple
440+
- name: dist-x86_64-apple-alt
441441
env:
442442
SCRIPT: >-
443443
./x.py dist bootstrap
@@ -456,14 +456,11 @@ auto:
456456
MACOSX_DEPLOYMENT_TARGET: 10.12
457457
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
458458
SELECT_XCODE: /Applications/Xcode_15.2.app
459-
NO_LLVM_ASSERTIONS: 1
460-
NO_DEBUG_ASSERTIONS: 1
461-
NO_OVERFLOW_CHECKS: 1
462459
DIST_REQUIRE_ALL_TOOLS: 1
463460
CODEGEN_BACKENDS: llvm,cranelift
464461
<<: *job-macos
465462

466-
- name: dist-apple-various
463+
- name: dist-apple-various-alt
467464
env:
468465
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
469466
# Mac Catalyst cannot currently compile the sanitizer:
@@ -474,12 +471,9 @@ auto:
474471
MACOSX_DEPLOYMENT_TARGET: 10.12
475472
MACOSX_STD_DEPLOYMENT_TARGET: 10.12
476473
SELECT_XCODE: /Applications/Xcode_15.2.app
477-
NO_LLVM_ASSERTIONS: 1
478-
NO_DEBUG_ASSERTIONS: 1
479-
NO_OVERFLOW_CHECKS: 1
480474
<<: *job-macos
481475

482-
- name: dist-aarch64-apple
476+
- name: dist-aarch64-apple-alt
483477
env:
484478
SCRIPT: ./x.py dist bootstrap --include-default-paths --host=aarch64-apple-darwin --target=aarch64-apple-darwin
485479
RUST_CONFIGURE_ARGS: >-
@@ -496,14 +490,11 @@ auto:
496490
# supports the hardware.
497491
MACOSX_DEPLOYMENT_TARGET: 11.0
498492
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
499-
NO_LLVM_ASSERTIONS: 1
500-
NO_DEBUG_ASSERTIONS: 1
501-
NO_OVERFLOW_CHECKS: 1
502493
DIST_REQUIRE_ALL_TOOLS: 1
503494
CODEGEN_BACKENDS: llvm,cranelift
504495
<<: *job-macos
505496

506-
- name: aarch64-apple
497+
- name: aarch64-apple-alt
507498
env:
508499
SCRIPT: >
509500
./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin &&
@@ -518,9 +509,6 @@ auto:
518509
# supports the hardware, so only need to test it there.
519510
MACOSX_DEPLOYMENT_TARGET: 11.0
520511
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
521-
NO_LLVM_ASSERTIONS: 1
522-
NO_DEBUG_ASSERTIONS: 1
523-
NO_OVERFLOW_CHECKS: 1
524512
<<: *job-macos
525513

526514
######################

0 commit comments

Comments
 (0)