Skip to content

Commit 223ccde

Browse files
borsbors
committed
Auto merge of rust-lang#117454 - shepmaster:github-actions-m1-tests, r=<try>
Run tests in CI for aarch64-apple-darwin r? `@ghost`
2 parents 50be229 + 7a2ab46 commit 223ccde

File tree

3 files changed

+69
-157
lines changed

3 files changed

+69
-157
lines changed

‎.github/workflows/ci.yml

+25-130
Original file line numberDiff line numberDiff line change
@@ -35,133 +35,6 @@ concurrency:
3535
group: "${{ github.workflow }}-${{ ((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.sha) || github.ref }}"
3636
cancel-in-progress: true
3737
jobs:
38-
pr:
39-
name: "PR - ${{ matrix.name }}"
40-
env:
41-
PR_CI_JOB: 1
42-
CI_JOB_NAME: "${{ matrix.name }}"
43-
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
44-
HEAD_SHA: "${{ github.event.pull_request.head.sha || github.sha }}"
45-
SCCACHE_BUCKET: rust-lang-ci-sccache2
46-
TOOLSTATE_REPO: "https://github.com/rust-lang-nursery/rust-toolstate"
47-
CACHE_DOMAIN: ci-caches.rust-lang.org
48-
if: "github.event_name == 'pull_request'"
49-
continue-on-error: "${{ matrix.name == 'mingw-check-tidy' }}"
50-
strategy:
51-
matrix:
52-
include:
53-
- name: mingw-check
54-
os: ubuntu-20.04-4core-16gb
55-
env: {}
56-
- name: mingw-check-tidy
57-
os: ubuntu-20.04-4core-16gb
58-
env: {}
59-
- name: x86_64-gnu-llvm-15
60-
os: ubuntu-20.04-16core-64gb
61-
env: {}
62-
- name: x86_64-gnu-tools
63-
os: ubuntu-20.04-16core-64gb
64-
env: {}
65-
timeout-minutes: 600
66-
runs-on: "${{ matrix.os }}"
67-
steps:
68-
- name: disable git crlf conversion
69-
run: git config --global core.autocrlf false
70-
- name: checkout the source code
71-
uses: actions/checkout@v4
72-
with:
73-
fetch-depth: 2
74-
- name: configure the PR in which the error message will be posted
75-
run: "echo \"[CI_PR_NUMBER=$num]\""
76-
env:
77-
num: "${{ github.event.number }}"
78-
if: "success() && !env.SKIP_JOB && github.event_name == 'pull_request'"
79-
- name: add extra environment variables
80-
run: src/ci/scripts/setup-environment.sh
81-
env:
82-
EXTRA_VARIABLES: "${{ toJson(matrix.env) }}"
83-
if: success() && !env.SKIP_JOB
84-
- name: decide whether to skip this job
85-
run: src/ci/scripts/should-skip-this.sh
86-
if: success() && !env.SKIP_JOB
87-
- name: ensure the channel matches the target branch
88-
run: src/ci/scripts/verify-channel.sh
89-
if: success() && !env.SKIP_JOB
90-
- name: collect CPU statistics
91-
run: src/ci/scripts/collect-cpu-stats.sh
92-
if: success() && !env.SKIP_JOB
93-
- name: show the current environment
94-
run: src/ci/scripts/dump-environment.sh
95-
if: success() && !env.SKIP_JOB
96-
- name: install awscli
97-
run: src/ci/scripts/install-awscli.sh
98-
if: success() && !env.SKIP_JOB
99-
- name: install sccache
100-
run: src/ci/scripts/install-sccache.sh
101-
if: success() && !env.SKIP_JOB
102-
- name: select Xcode
103-
run: src/ci/scripts/select-xcode.sh
104-
if: success() && !env.SKIP_JOB
105-
- name: install clang
106-
run: src/ci/scripts/install-clang.sh
107-
if: success() && !env.SKIP_JOB
108-
- name: install WIX
109-
run: src/ci/scripts/install-wix.sh
110-
if: success() && !env.SKIP_JOB
111-
- name: disable git crlf conversion
112-
run: src/ci/scripts/disable-git-crlf-conversion.sh
113-
if: success() && !env.SKIP_JOB
114-
- name: checkout submodules
115-
run: src/ci/scripts/checkout-submodules.sh
116-
if: success() && !env.SKIP_JOB
117-
- name: install MSYS2
118-
run: src/ci/scripts/install-msys2.sh
119-
if: success() && !env.SKIP_JOB
120-
- name: install MinGW
121-
run: src/ci/scripts/install-mingw.sh
122-
if: success() && !env.SKIP_JOB
123-
- name: install ninja
124-
run: src/ci/scripts/install-ninja.sh
125-
if: success() && !env.SKIP_JOB
126-
- name: enable ipv6 on Docker
127-
run: src/ci/scripts/enable-docker-ipv6.sh
128-
if: success() && !env.SKIP_JOB
129-
- name: disable git crlf conversion
130-
run: src/ci/scripts/disable-git-crlf-conversion.sh
131-
if: success() && !env.SKIP_JOB
132-
- name: ensure line endings are correct
133-
run: src/ci/scripts/verify-line-endings.sh
134-
if: success() && !env.SKIP_JOB
135-
- name: ensure backported commits are in upstream branches
136-
run: src/ci/scripts/verify-backported-commits.sh
137-
if: success() && !env.SKIP_JOB
138-
- name: ensure the stable version number is correct
139-
run: src/ci/scripts/verify-stable-version-number.sh
140-
if: success() && !env.SKIP_JOB
141-
- name: run the build
142-
run: src/ci/scripts/run-build-from-ci.sh
143-
env:
144-
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
145-
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
146-
TOOLSTATE_REPO_ACCESS_TOKEN: "${{ secrets.TOOLSTATE_REPO_ACCESS_TOKEN }}"
147-
if: success() && !env.SKIP_JOB
148-
- name: create github artifacts
149-
run: src/ci/scripts/create-doc-artifacts.sh
150-
if: success() && !env.SKIP_JOB
151-
- name: upload artifacts to github
152-
uses: actions/upload-artifact@v3
153-
with:
154-
name: "${{ env.DOC_ARTIFACT_NAME }}"
155-
path: obj/artifacts/doc
156-
if-no-files-found: ignore
157-
retention-days: 5
158-
if: success() && !env.SKIP_JOB
159-
- name: upload artifacts to S3
160-
run: src/ci/scripts/upload-artifacts.sh
161-
env:
162-
AWS_ACCESS_KEY_ID: "${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}"
163-
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}"
164-
if: "success() && !env.SKIP_JOB && (github.event_name == 'push' || env.DEPLOY == '1' || env.DEPLOY_ALT == '1')"
16538
auto:
16639
name: "auto - ${{ matrix.name }}"
16740
env:
@@ -369,6 +242,19 @@ jobs:
369242
NO_OVERFLOW_CHECKS: 1
370243
DIST_REQUIRE_ALL_TOOLS: 1
371244
os: macos-13-xlarge
245+
- name: aarch64-apple
246+
env:
247+
SCRIPT: "./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin"
248+
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
249+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
250+
SELECT_XCODE: /Applications/Xcode_13.4.1.app
251+
USE_XCODE_CLANG: 1
252+
MACOSX_DEPLOYMENT_TARGET: 11.0
253+
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
254+
NO_LLVM_ASSERTIONS: 1
255+
NO_DEBUG_ASSERTIONS: 1
256+
NO_OVERFLOW_CHECKS: 1
257+
os: macos-13-xlarge
372258
- name: x86_64-msvc
373259
env:
374260
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"
@@ -559,10 +445,19 @@ jobs:
559445
strategy:
560446
matrix:
561447
include:
562-
- name: dist-x86_64-linux
448+
- name: aarch64-apple
563449
env:
564-
CODEGEN_BACKENDS: "llvm,cranelift"
565-
os: ubuntu-20.04-16core-64gb
450+
SCRIPT: "./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin"
451+
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
452+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
453+
SELECT_XCODE: /Applications/Xcode_13.4.1.app
454+
USE_XCODE_CLANG: 1
455+
MACOSX_DEPLOYMENT_TARGET: 11.0
456+
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
457+
NO_LLVM_ASSERTIONS: 1
458+
NO_DEBUG_ASSERTIONS: 1
459+
NO_OVERFLOW_CHECKS: 1
460+
os: macos-13-xlarge
566461
timeout-minutes: 600
567462
runs-on: "${{ matrix.os }}"
568463
steps:

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

+43-27
Original file line numberDiff line numberDiff line change
@@ -313,28 +313,28 @@ concurrency:
313313
cancel-in-progress: true
314314

315315
jobs:
316-
pr:
317-
<<: *base-ci-job
318-
name: PR - ${{ matrix.name }}
319-
env:
320-
<<: [*shared-ci-variables, *public-variables]
321-
PR_CI_JOB: 1
322-
if: github.event_name == 'pull_request'
323-
continue-on-error: ${{ matrix.name == 'mingw-check-tidy' }}
324-
strategy:
325-
matrix:
326-
include:
327-
- name: mingw-check
328-
<<: *job-linux-4c
329-
330-
- name: mingw-check-tidy
331-
<<: *job-linux-4c
332-
333-
- name: x86_64-gnu-llvm-15
334-
<<: *job-linux-16c
335-
336-
- name: x86_64-gnu-tools
337-
<<: *job-linux-16c
316+
# pr:
317+
# <<: *base-ci-job
318+
# name: PR - ${{ matrix.name }}
319+
# env:
320+
# <<: [*shared-ci-variables, *public-variables]
321+
# PR_CI_JOB: 1
322+
# if: github.event_name == 'pull_request'
323+
# continue-on-error: ${{ matrix.name == 'mingw-check-tidy' }}
324+
# strategy:
325+
# matrix:
326+
# include:
327+
# - name: mingw-check
328+
# <<: *job-linux-4c
329+
330+
# - name: mingw-check-tidy
331+
# <<: *job-linux-4c
332+
333+
# - name: x86_64-gnu-llvm-15
334+
# <<: *job-linux-16c
335+
336+
# - name: x86_64-gnu-tools
337+
# <<: *job-linux-16c
338338

339339
auto:
340340
<<: *base-ci-job
@@ -563,6 +563,26 @@ jobs:
563563
DIST_REQUIRE_ALL_TOOLS: 1
564564
<<: *job-macos-m1
565565

566+
# This target only needs to support 11.0 and up as nothing else supports the hardware
567+
- &aarch64-apple
568+
name: aarch64-apple
569+
env:
570+
SCRIPT: ./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin
571+
RUST_CONFIGURE_ARGS: >-
572+
--enable-sanitizers
573+
--enable-profiler
574+
--set rust.jemalloc
575+
--set llvm.ninja=false
576+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
577+
SELECT_XCODE: /Applications/Xcode_13.4.1.app
578+
USE_XCODE_CLANG: 1
579+
MACOSX_DEPLOYMENT_TARGET: 11.0
580+
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
581+
NO_LLVM_ASSERTIONS: 1
582+
NO_DEBUG_ASSERTIONS: 1
583+
NO_OVERFLOW_CHECKS: 1
584+
<<: *job-macos-m1
585+
566586
######################
567587
# Windows Builders #
568588
######################
@@ -704,11 +724,7 @@ jobs:
704724
strategy:
705725
matrix:
706726
include:
707-
- &dist-x86_64-linux
708-
name: dist-x86_64-linux
709-
env:
710-
CODEGEN_BACKENDS: llvm,cranelift
711-
<<: *job-linux-16c
727+
- <<: *aarch64-apple
712728

713729
master:
714730
name: master

‎tests/rustdoc-ui/issues/issue-107918.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// aux-build:panic-handler.rs
22
// compile-flags: --document-private-items
33
// build-pass
4+
// ignore-macos
45
// ignore-windows
56

67
#![no_std]

0 commit comments

Comments
 (0)