Skip to content

Commit 57fb1e6

Browse files
committedNov 8, 2023
Auto merge of #117454 - shepmaster:github-actions-m1-tests, r=GuillaumeGomez,onur-ozkan
Run tests in CI for aarch64-apple-darwin r? `@ghost`
2 parents fdaaaf9 + 6909992 commit 57fb1e6

File tree

4 files changed

+70
-1
lines changed

4 files changed

+70
-1
lines changed
 

‎.github/workflows/ci.yml

+22
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,9 @@ jobs:
106106
- name: install clang
107107
run: src/ci/scripts/install-clang.sh
108108
if: success() && !env.SKIP_JOB
109+
- name: install tidy
110+
run: src/ci/scripts/install-tidy.sh
111+
if: success() && !env.SKIP_JOB
109112
- name: install WIX
110113
run: src/ci/scripts/install-wix.sh
111114
if: success() && !env.SKIP_JOB
@@ -370,6 +373,19 @@ jobs:
370373
NO_OVERFLOW_CHECKS: 1
371374
DIST_REQUIRE_ALL_TOOLS: 1
372375
os: macos-13-xlarge
376+
- name: aarch64-apple
377+
env:
378+
SCRIPT: "./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin"
379+
RUST_CONFIGURE_ARGS: "--enable-sanitizers --enable-profiler --set rust.jemalloc --set llvm.ninja=false"
380+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
381+
SELECT_XCODE: /Applications/Xcode_13.4.1.app
382+
USE_XCODE_CLANG: 1
383+
MACOSX_DEPLOYMENT_TARGET: 11.0
384+
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
385+
NO_LLVM_ASSERTIONS: 1
386+
NO_DEBUG_ASSERTIONS: 1
387+
NO_OVERFLOW_CHECKS: 1
388+
os: macos-13-xlarge
373389
- name: x86_64-msvc
374390
env:
375391
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"
@@ -483,6 +499,9 @@ jobs:
483499
- name: install clang
484500
run: src/ci/scripts/install-clang.sh
485501
if: success() && !env.SKIP_JOB
502+
- name: install tidy
503+
run: src/ci/scripts/install-tidy.sh
504+
if: success() && !env.SKIP_JOB
486505
- name: install WIX
487506
run: src/ci/scripts/install-wix.sh
488507
if: success() && !env.SKIP_JOB
@@ -607,6 +626,9 @@ jobs:
607626
- name: install clang
608627
run: src/ci/scripts/install-clang.sh
609628
if: success() && !env.SKIP_JOB
629+
- name: install tidy
630+
run: src/ci/scripts/install-tidy.sh
631+
if: success() && !env.SKIP_JOB
610632
- name: install WIX
611633
run: src/ci/scripts/install-wix.sh
612634
if: success() && !env.SKIP_JOB

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

+23
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,10 @@ x--expand-yaml-anchors--remove:
173173
run: src/ci/scripts/install-clang.sh
174174
<<: *step
175175

176+
- name: install tidy
177+
run: src/ci/scripts/install-tidy.sh
178+
<<: *step
179+
176180
- name: install WIX
177181
run: src/ci/scripts/install-wix.sh
178182
<<: *step
@@ -565,6 +569,25 @@ jobs:
565569
DIST_REQUIRE_ALL_TOOLS: 1
566570
<<: *job-macos-m1
567571

572+
# This target only needs to support 11.0 and up as nothing else supports the hardware
573+
- name: aarch64-apple
574+
env:
575+
SCRIPT: ./x.py --stage 2 test --host=aarch64-apple-darwin --target=aarch64-apple-darwin
576+
RUST_CONFIGURE_ARGS: >-
577+
--enable-sanitizers
578+
--enable-profiler
579+
--set rust.jemalloc
580+
--set llvm.ninja=false
581+
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
582+
SELECT_XCODE: /Applications/Xcode_13.4.1.app
583+
USE_XCODE_CLANG: 1
584+
MACOSX_DEPLOYMENT_TARGET: 11.0
585+
MACOSX_STD_DEPLOYMENT_TARGET: 11.0
586+
NO_LLVM_ASSERTIONS: 1
587+
NO_DEBUG_ASSERTIONS: 1
588+
NO_OVERFLOW_CHECKS: 1
589+
<<: *job-macos-m1
590+
568591
######################
569592
# Windows Builders #
570593
######################

‎src/ci/scripts/install-tidy.sh

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#!/bin/bash
2+
# This script downloads and installs the tidy binary from Homebrew.
3+
4+
set -euo pipefail
5+
IFS=$'\n\t'
6+
7+
source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
8+
9+
# Only the macOS arm64/aarch64 GitHub Actions runner needs to have tidy
10+
# installed; other platforms have it preinstalled.
11+
12+
if isMacOS; then
13+
platform=$(uname -m)
14+
case $platform in
15+
x86_64)
16+
;;
17+
arm64)
18+
brew install tidy-html5
19+
;;
20+
*)
21+
echo "unsupported architecture: ${platform}"
22+
exit 1
23+
esac
24+
fi

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

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

66
#![no_std]
77
#![no_main]

0 commit comments

Comments
 (0)
Please sign in to comment.