Skip to content

Commit 5de1462

Browse files
committed
Update CI config (#2768)
1 parent cdf8f20 commit 5de1462

File tree

1 file changed

+20
-27
lines changed

1 file changed

+20
-27
lines changed

.github/workflows/ci.yml

Lines changed: 20 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -30,42 +30,36 @@ concurrency:
3030

3131
jobs:
3232
test:
33-
name: cargo test (${{ matrix.os }})
33+
name: cargo test
3434
strategy:
3535
fail-fast: false
3636
matrix:
37-
os:
38-
- ubuntu-latest
39-
- macos-latest
40-
- windows-latest
37+
include:
38+
- os: ubuntu-latest
39+
- os: macos-latest
40+
- os: windows-latest
41+
- os: ubuntu-latest
42+
target: aarch64-unknown-linux-gnu
43+
- os: ubuntu-latest
44+
target: armv7-unknown-linux-gnueabihf
45+
- os: ubuntu-latest
46+
target: armv5te-unknown-linux-gnueabi
47+
- os: ubuntu-latest
48+
target: i686-unknown-linux-gnu
4149
runs-on: ${{ matrix.os }}
4250
steps:
4351
- uses: actions/checkout@v4
4452
- name: Install Rust
4553
# --no-self-update is necessary because the windows environment cannot self-update rustup.exe.
4654
run: rustup update nightly --no-self-update && rustup default nightly
47-
- run: cargo test --workspace --all-features
48-
- run: cargo test --workspace --all-features --release
49-
50-
cross:
51-
name: cargo test --target ${{ matrix.target }}
52-
strategy:
53-
fail-fast: false
54-
matrix:
55-
target:
56-
- aarch64-unknown-linux-gnu
57-
- armv7-unknown-linux-gnueabihf
58-
- i686-unknown-linux-gnu
59-
runs-on: ubuntu-latest
60-
steps:
61-
- uses: actions/checkout@v4
62-
- name: Install Rust
63-
run: rustup update nightly && rustup default nightly
6455
- uses: taiki-e/setup-cross-toolchain-action@v1
6556
with:
6657
target: ${{ matrix.target }}
67-
- run: cargo test --target ${{ matrix.target }} --workspace --all-features $DOCTEST_XCOMPILE
68-
- run: cargo test --target ${{ matrix.target }} --workspace --all-features --release $DOCTEST_XCOMPILE
58+
if: matrix.target != ''
59+
- run: cargo test --workspace --all-features $DOCTEST_XCOMPILE
60+
- run: cargo test --workspace --all-features --release $DOCTEST_XCOMPILE
61+
# TODO: https://github.com/rust-lang/futures-rs/issues/2451
62+
if: matrix.target != 'aarch64-unknown-linux-gnu'
6963

7064
core-msrv:
7165
name: cargo +${{ matrix.rust }} build (futures-{core, io, sink})
@@ -260,7 +254,7 @@ jobs:
260254
echo "::set-output name=success::false"
261255
fi
262256
if: github.repository_owner == 'rust-lang' && github.event_name == 'schedule'
263-
- uses: peter-evans/create-pull-request@v3
257+
- uses: peter-evans/create-pull-request@v5
264258
with:
265259
title: Update no_atomic_cas.rs
266260
body: |
@@ -297,8 +291,7 @@ jobs:
297291
steps:
298292
- uses: actions/checkout@v4
299293
- name: Install Rust
300-
run: rustup update nightly && rustup default nightly
301-
- run: rustup component add rust-src
294+
run: rustup toolchain install nightly --component rust-src && rustup default nightly
302295
- run: cargo -Z build-std test --workspace --all-features --target x86_64-unknown-linux-gnu --lib --tests
303296
env:
304297
# TODO: Once `cfg(sanitize = "..")` is stable, replace

0 commit comments

Comments
 (0)