Skip to content

Commit 1419136

Browse files
Merge pull request #419 from rust-lang/macos-arm-ci
Fix macos tests in CI
2 parents c886e69 + 4fcf18b commit 1419136

File tree

1 file changed

+30
-8
lines changed

1 file changed

+30
-8
lines changed

.github/workflows/ci.yml

+30-8
Original file line numberDiff line numberDiff line change
@@ -56,26 +56,19 @@ jobs:
5656
strategy:
5757
fail-fast: false
5858
matrix:
59-
target: [x86_64-pc-windows-msvc, i686-pc-windows-msvc, i586-pc-windows-msvc, x86_64-unknown-linux-gnu, x86_64-apple-darwin]
59+
target: [x86_64-pc-windows-msvc, i686-pc-windows-msvc, i586-pc-windows-msvc, x86_64-unknown-linux-gnu]
6060
# `default` means we use the default target config for the target,
6161
# `native` means we run with `-Ctarget-cpu=native`, and anything else is
6262
# an arg to `-Ctarget-feature`
6363
target_feature: [default, native, +sse3, +ssse3, +sse4.1, +sse4.2, +avx, +avx2]
6464

6565
exclude:
66-
# The macos runners seem to only reliably support up to `avx`.
67-
- { target: x86_64-apple-darwin, target_feature: +avx2 }
68-
# These features are statically known to be present for all 64 bit
69-
# macs, and thus are covered by the `default` test
70-
- { target: x86_64-apple-darwin, target_feature: +sse3 }
71-
- { target: x86_64-apple-darwin, target_feature: +ssse3 }
7266
# -Ctarget-cpu=native sounds like bad-news if target != host
7367
- { target: i686-pc-windows-msvc, target_feature: native }
7468
- { target: i586-pc-windows-msvc, target_feature: native }
7569

7670
include:
7771
# Populate the `matrix.os` field
78-
- { target: x86_64-apple-darwin, os: macos-latest }
7972
- { target: x86_64-unknown-linux-gnu, os: ubuntu-latest }
8073
- { target: x86_64-pc-windows-msvc, os: windows-latest }
8174
- { target: i686-pc-windows-msvc, os: windows-latest }
@@ -133,6 +126,35 @@ jobs:
133126
run: cargo doc --verbose --target=${{ matrix.target }}
134127
env:
135128
RUSTDOCFLAGS: -Dwarnings
129+
130+
macos-tests:
131+
name: ${{ matrix.target }}
132+
runs-on: macos-latest
133+
strategy:
134+
fail-fast: false
135+
matrix:
136+
target:
137+
- aarch64-apple-darwin
138+
- x86_64-apple-darwin
139+
steps:
140+
- uses: actions/checkout@v2
141+
- name: Setup Rust
142+
run: rustup target add ${{ matrix.target }}
143+
144+
- name: Configure RUSTFLAGS
145+
shell: bash
146+
run: echo "RUSTFLAGS=-Dwarnings" >> $GITHUB_ENV
147+
148+
- name: Test (debug)
149+
run: cargo test --verbose --target=${{ matrix.target }}
150+
151+
- name: Test (release)
152+
run: cargo test --verbose --target=${{ matrix.target }} --release
153+
154+
- name: Generate docs
155+
run: cargo doc --verbose --target=${{ matrix.target }}
156+
env:
157+
RUSTDOCFLAGS: -Dwarnings
136158

137159
wasm-tests:
138160
name: "wasm (firefox, ${{ matrix.name }})"

0 commit comments

Comments
 (0)