Skip to content

Commit 715e9b8

Browse files
committed
ci: move clippy check into test-linux
There's a lot of duplication between these jobs, so running clippy separately just wastes resources.
1 parent ce6a6b4 commit 715e9b8

File tree

1 file changed

+11
-35
lines changed

1 file changed

+11
-35
lines changed

.github/workflows/ci.yaml

Lines changed: 11 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,20 @@ jobs:
3737
.cache/*.tar.sig
3838
key: ${{ runner.os }}-deps-${{ hashFiles('**/nginx-sys/build.rs') }}
3939
restore-keys: ${{ runner.os }}-deps-
40+
- uses: dtolnay/rust-toolchain@stable
41+
with:
42+
components: rustfmt, clippy
43+
4044
- name: build
45+
id: build
4146
run: cargo build --workspace --all-targets --all-features
47+
48+
- name: run clippy
49+
if: ${{ !cancelled() && steps.build.outcome == 'success' }} # always run if build succeeds
50+
run: cargo clippy --workspace --all-targets --all-features -- -Dwarnings
51+
4252
- name: run tests
53+
if: ${{ !cancelled() && steps.build.outcome == 'success' }} # always run if build succeeds
4354
run: cargo test --workspace --all-features
4455

4556
examples-linux:
@@ -128,38 +139,3 @@ jobs:
128139
run: rustfmt --version
129140
- name: cargo fmt
130141
run: cargo fmt --all --check
131-
132-
clippy:
133-
name: Clippy
134-
runs-on: ubuntu-latest
135-
steps:
136-
- uses: actions/checkout@v4
137-
- name: set up cargo cache
138-
uses: actions/cache@v4
139-
continue-on-error: false
140-
with:
141-
path: |
142-
~/.cargo/bin/
143-
~/.cargo/registry/index/
144-
~/.cargo/registry/cache/
145-
~/.cargo/git/db/
146-
target/
147-
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
148-
restore-keys: ${{ runner.os }}-cargo-
149-
- name: set up nginx deps source cache
150-
uses: actions/cache@v4
151-
continue-on-error: false
152-
with:
153-
path: |
154-
.cache/.gnupg
155-
.cache/nginx
156-
.cache/*.tar.gz
157-
.cache/*.tar.asc
158-
.cache/*.tar.sig
159-
key: ${{ runner.os }}-deps-${{ hashFiles('**/nginx-sys/build.rs') }}
160-
restore-keys: ${{ runner.os }}-deps-
161-
- uses: dtolnay/rust-toolchain@stable
162-
with:
163-
components: rustfmt, clippy
164-
- name: run clippy
165-
run: cargo clippy --workspace --all-targets --all-features -- -Dwarnings

0 commit comments

Comments
 (0)