Skip to content

Commit ed0866a

Browse files
borsbors
committed
Auto merge of #120744 - ehuss:apple-ninja-testing, r=<try>
Apple CI build testing
2 parents 42752cb + dfd5bbb commit ed0866a

File tree

3 files changed

+338
-166
lines changed

3 files changed

+338
-166
lines changed

‎.github/workflows/ci.yml

Lines changed: 99 additions & 135 deletions
Original file line numberDiff line numberDiff line change
@@ -36,138 +36,6 @@ concurrency:
3636
group: "${{ github.workflow }}-${{ ((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.sha) || github.ref }}"
3737
cancel-in-progress: true
3838
jobs:
39-
pr:
40-
name: "PR - ${{ matrix.name }}"
41-
env:
42-
PR_CI_JOB: 1
43-
CI_JOB_NAME: "${{ matrix.name }}"
44-
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
45-
HEAD_SHA: "${{ github.event.pull_request.head.sha || github.sha }}"
46-
DOCKER_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
47-
SCCACHE_BUCKET: rust-lang-ci-sccache2
48-
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
49-
CACHE_DOMAIN: ci-caches.rust-lang.org
50-
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: {}
68-
timeout-minutes: 600
69-
runs-on: "${{ matrix.os }}"
70-
steps:
71-
- name: disable git crlf conversion
72-
run: git config --global core.autocrlf false
73-
- name: checkout the source code
74-
uses: actions/checkout@v4
75-
with:
76-
fetch-depth: 2
77-
- name: configure the PR in which the error message will be posted
78-
run: "echo \"[CI_PR_NUMBER=$num]\""
79-
env:
80-
num: "${{ github.event.number }}"
81-
if: "success() && !env.SKIP_JOB && github.event_name == 'pull_request'"
82-
- name: add extra environment variables
83-
run: src/ci/scripts/setup-environment.sh
84-
env:
85-
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
86-
if: success() && !env.SKIP_JOB
87-
- name: decide whether to skip this job
88-
run: src/ci/scripts/should-skip-this.sh
89-
if: success() && !env.SKIP_JOB
90-
- name: ensure the channel matches the target branch
91-
run: src/ci/scripts/verify-channel.sh
92-
if: success() && !env.SKIP_JOB
93-
- name: collect CPU statistics
94-
run: src/ci/scripts/collect-cpu-stats.sh
95-
if: success() && !env.SKIP_JOB
96-
- name: show the current environment
97-
run: src/ci/scripts/dump-environment.sh
98-
if: success() && !env.SKIP_JOB
99-
- name: install awscli
100-
run: src/ci/scripts/install-awscli.sh
101-
if: success() && !env.SKIP_JOB
102-
- name: install sccache
103-
run: src/ci/scripts/install-sccache.sh
104-
if: success() && !env.SKIP_JOB
105-
- name: select Xcode
106-
run: src/ci/scripts/select-xcode.sh
107-
if: success() && !env.SKIP_JOB
108-
- name: install clang
109-
run: src/ci/scripts/install-clang.sh
110-
if: success() && !env.SKIP_JOB
111-
- name: install tidy
112-
run: src/ci/scripts/install-tidy.sh
113-
if: success() && !env.SKIP_JOB
114-
- name: install WIX
115-
run: src/ci/scripts/install-wix.sh
116-
if: success() && !env.SKIP_JOB
117-
- name: disable git crlf conversion
118-
run: src/ci/scripts/disable-git-crlf-conversion.sh
119-
if: success() && !env.SKIP_JOB
120-
- name: checkout submodules
121-
run: src/ci/scripts/checkout-submodules.sh
122-
if: success() && !env.SKIP_JOB
123-
- name: install MSYS2
124-
run: src/ci/scripts/install-msys2.sh
125-
if: success() && !env.SKIP_JOB
126-
- name: install MinGW
127-
run: src/ci/scripts/install-mingw.sh
128-
if: success() && !env.SKIP_JOB
129-
- name: install ninja
130-
run: src/ci/scripts/install-ninja.sh
131-
if: success() && !env.SKIP_JOB
132-
- name: enable ipv6 on Docker
133-
run: src/ci/scripts/enable-docker-ipv6.sh
134-
if: success() && !env.SKIP_JOB
135-
- name: disable git crlf conversion
136-
run: src/ci/scripts/disable-git-crlf-conversion.sh
137-
if: success() && !env.SKIP_JOB
138-
- name: ensure line endings are correct
139-
run: src/ci/scripts/verify-line-endings.sh
140-
if: success() && !env.SKIP_JOB
141-
- name: ensure backported commits are in upstream branches
142-
run: src/ci/scripts/verify-backported-commits.sh
143-
if: success() && !env.SKIP_JOB
144-
- name: ensure the stable version number is correct
145-
run: src/ci/scripts/verify-stable-version-number.sh
146-
if: success() && !env.SKIP_JOB
147-
- name: run the build
148-
run: src/ci/scripts/run-build-from-ci.sh
149-
env:
150-
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
151-
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
152-
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
153-
if: success() && !env.SKIP_JOB
154-
- name: create github artifacts
155-
run: src/ci/scripts/create-doc-artifacts.sh
156-
if: success() && !env.SKIP_JOB
157-
- name: upload artifacts to github
158-
uses: actions/upload-artifact@v3
159-
with:
160-
name: "${{ env.DOC_ARTIFACT_NAME }}"
161-
path: obj/artifacts/doc
162-
if-no-files-found: ignore
163-
retention-days: 5
164-
if: success() && !env.SKIP_JOB
165-
- name: upload artifacts to S3
166-
run: src/ci/scripts/upload-artifacts.sh
167-
env:
168-
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
169-
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
170-
if: "success() && !env.SKIP_JOB && (github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1')"
17139
auto:
17240
name: "auto - ${{ matrix.name }}"
17341
env:
@@ -583,10 +451,106 @@ jobs:
583451
strategy:
584452
matrix:
585453
include:
586-
- name: dist-x86_64-linux
454+
- name: dist-apple-various
587455
env:
588-
CODEGEN_BACKENDS: "llvm,cranelift"
589-
os: ubuntu-20.04-16core-64gb
456+
SCRIPT: "./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim"
457+
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc"
458+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
459+
MACOSX_DEPLOYMENT_TARGET: 10.12
460+
NO_LLVM_ASSERTIONS: 1
461+
NO_DEBUG_ASSERTIONS: 1
462+
NO_OVERFLOW_CHECKS: 1
463+
os: macos-13
464+
- name: dist-apple-various-2
465+
env:
466+
SCRIPT: "./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim"
467+
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc"
468+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
469+
MACOSX_DEPLOYMENT_TARGET: 10.12
470+
NO_LLVM_ASSERTIONS: 1
471+
NO_DEBUG_ASSERTIONS: 1
472+
NO_OVERFLOW_CHECKS: 1
473+
os: macos-13
474+
- name: dist-apple-various-3
475+
env:
476+
SCRIPT: "./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim"
477+
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc"
478+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
479+
MACOSX_DEPLOYMENT_TARGET: 10.12
480+
NO_LLVM_ASSERTIONS: 1
481+
NO_DEBUG_ASSERTIONS: 1
482+
NO_OVERFLOW_CHECKS: 1
483+
os: macos-13
484+
- name: dist-apple-various-4
485+
env:
486+
SCRIPT: "./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim"
487+
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc"
488+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
489+
MACOSX_DEPLOYMENT_TARGET: 10.12
490+
NO_LLVM_ASSERTIONS: 1
491+
NO_DEBUG_ASSERTIONS: 1
492+
NO_OVERFLOW_CHECKS: 1
493+
os: macos-13
494+
- name: dist-apple-various-5
495+
env:
496+
SCRIPT: "./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim"
497+
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc"
498+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
499+
MACOSX_DEPLOYMENT_TARGET: 10.12
500+
NO_LLVM_ASSERTIONS: 1
501+
NO_DEBUG_ASSERTIONS: 1
502+
NO_OVERFLOW_CHECKS: 1
503+
os: macos-13
504+
- name: dist-apple-various-6
505+
env:
506+
SCRIPT: "./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim"
507+
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc"
508+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
509+
MACOSX_DEPLOYMENT_TARGET: 10.12
510+
NO_LLVM_ASSERTIONS: 1
511+
NO_DEBUG_ASSERTIONS: 1
512+
NO_OVERFLOW_CHECKS: 1
513+
os: macos-13
514+
- name: dist-apple-various-7
515+
env:
516+
SCRIPT: "./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim"
517+
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc"
518+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
519+
MACOSX_DEPLOYMENT_TARGET: 10.12
520+
NO_LLVM_ASSERTIONS: 1
521+
NO_DEBUG_ASSERTIONS: 1
522+
NO_OVERFLOW_CHECKS: 1
523+
os: macos-13
524+
- name: dist-apple-various-8
525+
env:
526+
SCRIPT: "./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim"
527+
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc"
528+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
529+
MACOSX_DEPLOYMENT_TARGET: 10.12
530+
NO_LLVM_ASSERTIONS: 1
531+
NO_DEBUG_ASSERTIONS: 1
532+
NO_OVERFLOW_CHECKS: 1
533+
os: macos-13
534+
- name: dist-apple-various-9
535+
env:
536+
SCRIPT: "./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim"
537+
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc"
538+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
539+
MACOSX_DEPLOYMENT_TARGET: 10.12
540+
NO_LLVM_ASSERTIONS: 1
541+
NO_DEBUG_ASSERTIONS: 1
542+
NO_OVERFLOW_CHECKS: 1
543+
os: macos-13
544+
- name: dist-apple-various-10
545+
env:
546+
SCRIPT: "./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim"
547+
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc"
548+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
549+
MACOSX_DEPLOYMENT_TARGET: 10.12
550+
NO_LLVM_ASSERTIONS: 1
551+
NO_DEBUG_ASSERTIONS: 1
552+
NO_OVERFLOW_CHECKS: 1
553+
os: macos-13
590554
timeout-minutes: 600
591555
runs-on: "${{ matrix.os }}"
592556
steps:

0 commit comments

Comments
 (0)