Skip to content

Commit 7549dbd

Browse files
borsbors
committed
Auto merge of #112268 - lqd:osx-1cgu, r=<try>
Build `rustc` with 1CGU on `x86_64-apple-darwin` Part of the sanity checks for building rustc with 1CGU everywhere: - if the `dist-x86_64-apple` builder doesn't timeout - how the resulting artifacts perform on `x86_64-apple-darwin` r? `@ghost`
2 parents 41d97c8 + 4296eae commit 7549dbd

File tree

2 files changed

+38
-38
lines changed

2 files changed

+38
-38
lines changed

‎.github/workflows/ci.yml

+12-20
Original file line numberDiff line numberDiff line change
@@ -48,23 +48,6 @@ jobs:
4848
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
4949
CACHE_DOMAIN: ci-caches.rust-lang.org
5050
if: "github.event_name == 'pull_request'"
51-
continue-on-error: "${{ matrix.name == 'mingw-check-tidy' }}"
52-
strategy:
53-
matrix:
54-
include:
55-
- name: mingw-check
56-
os: ubuntu-20.04-4core-16gb
57-
env: {}
58-
- name: mingw-check-tidy
59-
os: ubuntu-20.04-4core-16gb
60-
env: {}
61-
- name: x86_64-gnu-llvm-16
62-
env:
63-
ENABLE_GCC_CODEGEN: "1"
64-
os: ubuntu-20.04-16core-64gb
65-
- name: x86_64-gnu-tools
66-
os: ubuntu-20.04-16core-64gb
67-
env: {}
6851
defaults:
6952
run:
7053
shell: "${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }}"
@@ -333,7 +316,7 @@ jobs:
333316
- name: dist-x86_64-apple
334317
env:
335318
SCRIPT: "./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin"
336-
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin"
319+
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin --set rust.codegen-units=1"
337320
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
338321
MACOSX_DEPLOYMENT_TARGET: 10.12
339322
SELECT_XCODE: /Applications/Xcode_14.3.1.app
@@ -610,10 +593,19 @@ jobs:
610593
strategy:
611594
matrix:
612595
include:
613-
- name: dist-x86_64-linux
596+
- name: dist-x86_64-apple
614597
env:
598+
SCRIPT: "./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin"
599+
RUST_CONFIGURE_ARGS: "--enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin --set rust.codegen-units=1"
600+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
601+
MACOSX_DEPLOYMENT_TARGET: 10.12
602+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
603+
NO_LLVM_ASSERTIONS: 1
604+
NO_DEBUG_ASSERTIONS: 1
605+
NO_OVERFLOW_CHECKS: 1
606+
DIST_REQUIRE_ALL_TOOLS: 1
615607
CODEGEN_BACKENDS: "llvm,cranelift"
616-
os: ubuntu-20.04-16core-64gb
608+
os: macos-13
617609
defaults:
618610
run:
619611
shell: "${{ contains(matrix.os, 'windows') && 'msys2 {0}' || 'bash' }}"

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

+26-18
Original file line numberDiff line numberDiff line change
@@ -347,23 +347,23 @@ jobs:
347347
<<: [*shared-ci-variables, *public-variables]
348348
PR_CI_JOB: 1
349349
if: github.event_name == 'pull_request'
350-
continue-on-error: ${{ matrix.name == 'mingw-check-tidy' }}
351-
strategy:
352-
matrix:
353-
include:
354-
- name: mingw-check
355-
<<: *job-linux-4c
350+
# continue-on-error: ${{ matrix.name == 'mingw-check-tidy' }}
351+
# strategy:
352+
# matrix:
353+
# include:
354+
# - name: mingw-check
355+
# <<: *job-linux-4c
356356

357-
- name: mingw-check-tidy
358-
<<: *job-linux-4c
357+
# - name: mingw-check-tidy
358+
# <<: *job-linux-4c
359359

360-
- name: x86_64-gnu-llvm-16
361-
env:
362-
ENABLE_GCC_CODEGEN: "1"
363-
<<: *job-linux-16c
360+
# - name: x86_64-gnu-llvm-16
361+
# env:
362+
# ENABLE_GCC_CODEGEN: "1"
363+
# <<: *job-linux-16c
364364

365-
- name: x86_64-gnu-tools
366-
<<: *job-linux-16c
365+
# - name: x86_64-gnu-tools
366+
# <<: *job-linux-16c
367367

368368
auto:
369369
<<: *base-ci-job
@@ -535,7 +535,7 @@ jobs:
535535
- name: dist-x86_64-apple
536536
env:
537537
SCRIPT: ./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin
538-
RUST_CONFIGURE_ARGS: --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin
538+
RUST_CONFIGURE_ARGS: --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin --set rust.codegen-units=1
539539
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
540540
MACOSX_DEPLOYMENT_TARGET: 10.12
541541
SELECT_XCODE: /Applications/Xcode_14.3.1.app
@@ -758,11 +758,19 @@ jobs:
758758
strategy:
759759
matrix:
760760
include:
761-
- &dist-x86_64-linux
762-
name: dist-x86_64-linux
761+
- name: dist-x86_64-apple
763762
env:
763+
SCRIPT: ./x.py dist bootstrap --include-default-paths --host=x86_64-apple-darwin --target=x86_64-apple-darwin
764+
RUST_CONFIGURE_ARGS: --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc --set rust.lto=thin --set rust.codegen-units=1
765+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
766+
MACOSX_DEPLOYMENT_TARGET: 10.12
767+
SELECT_XCODE: /Applications/Xcode_14.3.1.app
768+
NO_LLVM_ASSERTIONS: 1
769+
NO_DEBUG_ASSERTIONS: 1
770+
NO_OVERFLOW_CHECKS: 1
771+
DIST_REQUIRE_ALL_TOOLS: 1
764772
CODEGEN_BACKENDS: llvm,cranelift
765-
<<: *job-linux-16c
773+
<<: *job-macos-xl
766774

767775

768776
master:

0 commit comments

Comments
 (0)