Skip to content

Commit 5edaaf4

Browse files
committed
ci: split out MSRV clippy job
Previously there was one job that ran clippy across all supported operating systems for both the latest stable, and the MSRV Rust toolchains. This commit splits that job into two: one for stable and one for the MSRV toolchain. This will make it easier to customize MSRV specific settings in a subsequent commit.
1 parent 8b3e623 commit 5edaaf4

File tree

1 file changed

+41
-6
lines changed

1 file changed

+41
-6
lines changed

.github/workflows/ci.yml

Lines changed: 41 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,13 @@ jobs:
2222
- ubuntu-latest
2323
- macos-latest
2424
- windows-latest
25-
rust:
26-
- stable
27-
# MSRV
28-
- 1.56.0
2925
steps:
3026
- uses: actions/checkout@v3
3127
with:
3228
persist-credentials: false
3329

34-
- uses: dtolnay/rust-toolchain@master
30+
- uses: dtolnay/rust-toolchain@stable
3531
with:
36-
toolchain: ${{ matrix.rust }}
3732
components: clippy
3833

3934
- name: Clippy (${{ matrix.os }})
@@ -59,6 +54,46 @@ jobs:
5954
# rustup target add wasm32-unknown-unknown
6055
# cargo clippy-ci --target wasm32-unknown-unknown
6156

57+
clippy-msrv:
58+
name: Clippy (MSRV)
59+
runs-on: ${{ matrix.os }}
60+
strategy:
61+
matrix:
62+
os:
63+
- ubuntu-latest
64+
- macos-latest
65+
- windows-latest
66+
steps:
67+
- uses: actions/checkout@v3
68+
with:
69+
persist-credentials: false
70+
71+
- uses: dtolnay/rust-toolchain@master
72+
with:
73+
toolchain: "1.56.0" # MSRV
74+
components: clippy
75+
76+
- name: Install cargo-ndk.
77+
run: |
78+
cargo install cargo-ndk
79+
rustup target add aarch64-linux-android
80+
81+
- name: Clippy (${{ matrix.os }})
82+
run: cargo clippy-ci
83+
84+
- name: Clippy (Android)
85+
if: matrix.os == 'ubuntu-latest'
86+
run: |
87+
cargo ndk -t arm64-v8a clippy-ci
88+
89+
- name: Clippy (iOS)
90+
if: matrix.os == 'macos-latest'
91+
run: |
92+
rustup target add x86_64-apple-ios
93+
cargo clippy-ci --target x86_64-apple-ios
94+
95+
# TODO: Consider WASM. See note on "clippy" job.
96+
6297
test:
6398
name: Test
6499
runs-on: ${{ matrix.os }}

0 commit comments

Comments
 (0)