diff options
| author | Caleb Zulawski <caleb.zulawski@gmail.com> | 2024-04-29 23:20:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-29 23:20:35 -0400 |
| commit | 1419136ced833bc4a1c27fd9e944743f02764f01 (patch) | |
| tree | 89535332b964b7b14f0b1c53ae37bb581ae540f7 | |
| parent | c886e69cb44c72b3efd2293b321702d729ae0a78 (diff) | |
| parent | 4fcf18b5681530c36413f30cdeac9635c6dc3488 (diff) | |
| download | rust-1419136ced833bc4a1c27fd9e944743f02764f01.tar.gz rust-1419136ced833bc4a1c27fd9e944743f02764f01.zip | |
Merge pull request #419 from rust-lang/macos-arm-ci
Fix macos tests in CI
| -rw-r--r-- | .github/workflows/ci.yml | 38 |
1 files changed, 30 insertions, 8 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d3f79733d3a..ef6a9e611ac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,26 +56,19 @@ jobs: strategy: fail-fast: false matrix: - target: [x86_64-pc-windows-msvc, i686-pc-windows-msvc, i586-pc-windows-msvc, x86_64-unknown-linux-gnu, x86_64-apple-darwin] + target: [x86_64-pc-windows-msvc, i686-pc-windows-msvc, i586-pc-windows-msvc, x86_64-unknown-linux-gnu] # `default` means we use the default target config for the target, # `native` means we run with `-Ctarget-cpu=native`, and anything else is # an arg to `-Ctarget-feature` target_feature: [default, native, +sse3, +ssse3, +sse4.1, +sse4.2, +avx, +avx2] exclude: - # The macos runners seem to only reliably support up to `avx`. - - { target: x86_64-apple-darwin, target_feature: +avx2 } - # These features are statically known to be present for all 64 bit - # macs, and thus are covered by the `default` test - - { target: x86_64-apple-darwin, target_feature: +sse3 } - - { target: x86_64-apple-darwin, target_feature: +ssse3 } # -Ctarget-cpu=native sounds like bad-news if target != host - { target: i686-pc-windows-msvc, target_feature: native } - { target: i586-pc-windows-msvc, target_feature: native } include: # Populate the `matrix.os` field - - { target: x86_64-apple-darwin, os: macos-latest } - { target: x86_64-unknown-linux-gnu, os: ubuntu-latest } - { target: x86_64-pc-windows-msvc, os: windows-latest } - { target: i686-pc-windows-msvc, os: windows-latest } @@ -133,6 +126,35 @@ jobs: run: cargo doc --verbose --target=${{ matrix.target }} env: RUSTDOCFLAGS: -Dwarnings + + macos-tests: + name: ${{ matrix.target }} + runs-on: macos-latest + strategy: + fail-fast: false + matrix: + target: + - aarch64-apple-darwin + - x86_64-apple-darwin + steps: + - uses: actions/checkout@v2 + - name: Setup Rust + run: rustup target add ${{ matrix.target }} + + - name: Configure RUSTFLAGS + shell: bash + run: echo "RUSTFLAGS=-Dwarnings" >> $GITHUB_ENV + + - name: Test (debug) + run: cargo test --verbose --target=${{ matrix.target }} + + - name: Test (release) + run: cargo test --verbose --target=${{ matrix.target }} --release + + - name: Generate docs + run: cargo doc --verbose --target=${{ matrix.target }} + env: + RUSTDOCFLAGS: -Dwarnings wasm-tests: name: "wasm (firefox, ${{ matrix.name }})" |