Skip to content

Commit 9bf1f27

Browse files
pietroalbinipietroalbini
committed
ci: gate macOS on GHA too
1 parent a874956 commit 9bf1f27

File tree

2 files changed

+135
-87
lines changed

2 files changed

+135
-87
lines changed

‎.github/workflows/ci.yml

+62-36
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
7777
with:
7878
github_token: "${{ secrets.github_token }}"
79-
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try' && !env.RUST_CI_TEMP_SKIP_CANCEL_OUTDATED"
79+
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
8080
- name: collect CPU statistics
8181
run: src/ci/scripts/collect-cpu-stats.sh
8282
if: success() && !env.SKIP_JOB
@@ -180,7 +180,7 @@ jobs:
180180
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
181181
with:
182182
github_token: "${{ secrets.github_token }}"
183-
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try' && !env.RUST_CI_TEMP_SKIP_CANCEL_OUTDATED"
183+
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
184184
- name: collect CPU statistics
185185
run: src/ci/scripts/collect-cpu-stats.sh
186186
if: success() && !env.SKIP_JOB
@@ -375,6 +375,64 @@ jobs:
375375
env:
376376
DEPLOY_TOOLSTATES_JSON: toolstates-linux.json
377377
os: ubuntu-latest-xl
378+
- name: dist-x86_64-apple
379+
env:
380+
SCRIPT: "./x.py dist"
381+
RUST_CONFIGURE_ARGS: "--host=x86_64-apple-darwin --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
382+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
383+
MACOSX_DEPLOYMENT_TARGET: 10.7
384+
NO_LLVM_ASSERTIONS: 1
385+
NO_DEBUG_ASSERTIONS: 1
386+
DIST_REQUIRE_ALL_TOOLS: 1
387+
os: macos-latest
388+
- name: dist-x86_64-apple-alt
389+
env:
390+
SCRIPT: "./x.py dist"
391+
RUST_CONFIGURE_ARGS: "--enable-extended --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
392+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
393+
MACOSX_DEPLOYMENT_TARGET: 10.7
394+
NO_LLVM_ASSERTIONS: 1
395+
NO_DEBUG_ASSERTIONS: 1
396+
os: macos-latest
397+
- name: x86_64-apple
398+
env:
399+
SCRIPT: "./x.py --stage 2 test"
400+
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
401+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
402+
MACOSX_DEPLOYMENT_TARGET: 10.8
403+
MACOSX_STD_DEPLOYMENT_TARGET: 10.7
404+
NO_LLVM_ASSERTIONS: 1
405+
NO_DEBUG_ASSERTIONS: 1
406+
os: macos-latest
407+
- name: dist-x86_64-apple
408+
env:
409+
SCRIPT: "./x.py dist"
410+
RUST_CONFIGURE_ARGS: "--host=x86_64-apple-darwin --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
411+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
412+
MACOSX_DEPLOYMENT_TARGET: 10.7
413+
NO_LLVM_ASSERTIONS: 1
414+
NO_DEBUG_ASSERTIONS: 1
415+
DIST_REQUIRE_ALL_TOOLS: 1
416+
os: macos-latest
417+
- name: dist-x86_64-apple-alt
418+
env:
419+
SCRIPT: "./x.py dist"
420+
RUST_CONFIGURE_ARGS: "--enable-extended --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
421+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
422+
MACOSX_DEPLOYMENT_TARGET: 10.7
423+
NO_LLVM_ASSERTIONS: 1
424+
NO_DEBUG_ASSERTIONS: 1
425+
os: macos-latest
426+
- name: x86_64-apple
427+
env:
428+
SCRIPT: "./x.py --stage 2 test"
429+
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
430+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
431+
MACOSX_DEPLOYMENT_TARGET: 10.8
432+
MACOSX_STD_DEPLOYMENT_TARGET: 10.7
433+
NO_LLVM_ASSERTIONS: 1
434+
NO_DEBUG_ASSERTIONS: 1
435+
os: macos-latest
378436
- name: x86_64-msvc-1
379437
env:
380438
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"
@@ -499,7 +557,7 @@ jobs:
499557
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
500558
with:
501559
github_token: "${{ secrets.github_token }}"
502-
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try' && !env.RUST_CI_TEMP_SKIP_CANCEL_OUTDATED"
560+
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
503561
- name: collect CPU statistics
504562
run: src/ci/scripts/collect-cpu-stats.sh
505563
if: success() && !env.SKIP_JOB
@@ -580,38 +638,6 @@ jobs:
580638
- self-hosted
581639
- ARM64
582640
- linux
583-
- name: dist-x86_64-apple
584-
env:
585-
SCRIPT: "./x.py dist"
586-
RUST_CONFIGURE_ARGS: "--host=x86_64-apple-darwin --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
587-
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
588-
MACOSX_DEPLOYMENT_TARGET: 10.7
589-
NO_LLVM_ASSERTIONS: 1
590-
NO_DEBUG_ASSERTIONS: 1
591-
DIST_REQUIRE_ALL_TOOLS: 1
592-
RUST_CI_TEMP_SKIP_CANCEL_OUTDATED: 1
593-
os: macos-latest
594-
- name: dist-x86_64-apple-alt
595-
env:
596-
SCRIPT: "./x.py dist"
597-
RUST_CONFIGURE_ARGS: "--enable-extended --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
598-
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
599-
MACOSX_DEPLOYMENT_TARGET: 10.7
600-
NO_LLVM_ASSERTIONS: 1
601-
NO_DEBUG_ASSERTIONS: 1
602-
RUST_CI_TEMP_SKIP_CANCEL_OUTDATED: 1
603-
os: macos-latest
604-
- name: x86_64-apple
605-
env:
606-
SCRIPT: "./x.py --stage 2 test"
607-
RUST_CONFIGURE_ARGS: "--build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
608-
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
609-
MACOSX_DEPLOYMENT_TARGET: 10.8
610-
MACOSX_STD_DEPLOYMENT_TARGET: 10.7
611-
NO_LLVM_ASSERTIONS: 1
612-
NO_DEBUG_ASSERTIONS: 1
613-
RUST_CI_TEMP_SKIP_CANCEL_OUTDATED: 1
614-
os: macos-latest
615641
timeout-minutes: 600
616642
runs-on: "${{ matrix.os }}"
617643
steps:
@@ -638,7 +664,7 @@ jobs:
638664
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
639665
with:
640666
github_token: "${{ secrets.github_token }}"
641-
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try' && !env.RUST_CI_TEMP_SKIP_CANCEL_OUTDATED"
667+
if: "success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'"
642668
- name: collect CPU statistics
643669
run: src/ci/scripts/collect-cpu-stats.sh
644670
if: success() && !env.SKIP_JOB

‎src/ci/github-actions/ci.yml

+73-51
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,7 @@ x--expand-yaml-anchors--remove:
130130
uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
131131
with:
132132
github_token: "${{ secrets.github_token }}"
133-
# TODO: remove the condition on RUST_CI_TEMP_SKIP_CANCEL_OUTDATED once
134-
# we remove the `auto-fallible` job.
135-
if: success() && !env.SKIP_JOB && github.ref != 'refs/heads/try' && !env.RUST_CI_TEMP_SKIP_CANCEL_OUTDATED
133+
if: success() && !env.SKIP_JOB && github.ref != 'refs/heads/try'
136134
<<: *step
137135

138136
- name: collect CPU statistics
@@ -434,6 +432,78 @@ jobs:
434432
DEPLOY_TOOLSTATES_JSON: toolstates-linux.json
435433
<<: *job-linux-xl
436434

435+
####################
436+
# macOS Builders #
437+
####################
438+
439+
- name: dist-x86_64-apple
440+
env:
441+
SCRIPT: ./x.py dist
442+
RUST_CONFIGURE_ARGS: --host=x86_64-apple-darwin --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false
443+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
444+
MACOSX_DEPLOYMENT_TARGET: 10.7
445+
NO_LLVM_ASSERTIONS: 1
446+
NO_DEBUG_ASSERTIONS: 1
447+
DIST_REQUIRE_ALL_TOOLS: 1
448+
<<: *job-macos-xl
449+
450+
- name: dist-x86_64-apple-alt
451+
env:
452+
SCRIPT: ./x.py dist
453+
RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --set rust.jemalloc --set llvm.ninja=false
454+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
455+
MACOSX_DEPLOYMENT_TARGET: 10.7
456+
NO_LLVM_ASSERTIONS: 1
457+
NO_DEBUG_ASSERTIONS: 1
458+
<<: *job-macos-xl
459+
460+
- name: x86_64-apple
461+
env:
462+
SCRIPT: ./x.py --stage 2 test
463+
RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false
464+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
465+
MACOSX_DEPLOYMENT_TARGET: 10.8
466+
MACOSX_STD_DEPLOYMENT_TARGET: 10.7
467+
NO_LLVM_ASSERTIONS: 1
468+
NO_DEBUG_ASSERTIONS: 1
469+
<<: *job-macos-xl
470+
471+
####################
472+
# macOS Builders #
473+
####################
474+
475+
- name: dist-x86_64-apple
476+
env:
477+
SCRIPT: ./x.py dist
478+
RUST_CONFIGURE_ARGS: --host=x86_64-apple-darwin --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false
479+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
480+
MACOSX_DEPLOYMENT_TARGET: 10.7
481+
NO_LLVM_ASSERTIONS: 1
482+
NO_DEBUG_ASSERTIONS: 1
483+
DIST_REQUIRE_ALL_TOOLS: 1
484+
<<: *job-macos-xl
485+
486+
- name: dist-x86_64-apple-alt
487+
env:
488+
SCRIPT: ./x.py dist
489+
RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --set rust.jemalloc --set llvm.ninja=false
490+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
491+
MACOSX_DEPLOYMENT_TARGET: 10.7
492+
NO_LLVM_ASSERTIONS: 1
493+
NO_DEBUG_ASSERTIONS: 1
494+
<<: *job-macos-xl
495+
496+
- name: x86_64-apple
497+
env:
498+
SCRIPT: ./x.py --stage 2 test
499+
RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false
500+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
501+
MACOSX_DEPLOYMENT_TARGET: 10.8
502+
MACOSX_STD_DEPLOYMENT_TARGET: 10.7
503+
NO_LLVM_ASSERTIONS: 1
504+
NO_DEBUG_ASSERTIONS: 1
505+
<<: *job-macos-xl
506+
437507
######################
438508
# Windows Builders #
439509
######################
@@ -600,54 +670,6 @@ jobs:
600670
- name: aarch64-gnu
601671
<<: *job-aarch64-linux
602672

603-
####################
604-
# macOS Builders #
605-
####################
606-
607-
- name: dist-x86_64-apple
608-
env:
609-
SCRIPT: ./x.py dist
610-
RUST_CONFIGURE_ARGS: --host=x86_64-apple-darwin --target=aarch64-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false
611-
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
612-
MACOSX_DEPLOYMENT_TARGET: 10.7
613-
NO_LLVM_ASSERTIONS: 1
614-
NO_DEBUG_ASSERTIONS: 1
615-
DIST_REQUIRE_ALL_TOOLS: 1
616-
617-
# TODO: remove once we move this job away from auto-fallible.
618-
# Also, remove the variable from the cancel-outdated-builds step
619-
RUST_CI_TEMP_SKIP_CANCEL_OUTDATED: 1
620-
<<: *job-macos-xl
621-
622-
- name: dist-x86_64-apple-alt
623-
env:
624-
SCRIPT: ./x.py dist
625-
RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --set rust.jemalloc --set llvm.ninja=false
626-
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
627-
MACOSX_DEPLOYMENT_TARGET: 10.7
628-
NO_LLVM_ASSERTIONS: 1
629-
NO_DEBUG_ASSERTIONS: 1
630-
631-
# TODO: remove once we move this job away from auto-fallible.
632-
# Also, remove the variable from the cancel-outdated-builds step
633-
RUST_CI_TEMP_SKIP_CANCEL_OUTDATED: 1
634-
<<: *job-macos-xl
635-
636-
- name: x86_64-apple
637-
env:
638-
SCRIPT: ./x.py --stage 2 test
639-
RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false
640-
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
641-
MACOSX_DEPLOYMENT_TARGET: 10.8
642-
MACOSX_STD_DEPLOYMENT_TARGET: 10.7
643-
NO_LLVM_ASSERTIONS: 1
644-
NO_DEBUG_ASSERTIONS: 1
645-
646-
# TODO: remove once we move this job away from auto-fallible.
647-
# Also, remove the variable from the cancel-outdated-builds step
648-
RUST_CI_TEMP_SKIP_CANCEL_OUTDATED: 1
649-
<<: *job-macos-xl
650-
651673
master:
652674
name: master
653675
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)