Skip to content

Commit 488c71b

Browse files
committed
Fix CI
1 parent 8971962 commit 488c71b

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

.github/workflows/main.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ jobs:
2828
- uses: actions/checkout@v4
2929

3030
- name: Install Rust toolchain
31-
uses: dtolnay/rust-toolchain@${{ matrix.rust_os.rust }}
31+
uses: dtolnay/rust-toolchain@master
32+
with:
33+
toolchain: ${{ matrix.rust_os.rust }}
34+
components: rustfmt
3235

3336
# Newer dependency versions may not support rustc 1.70, so we use a Cargo.lock file for those
3437
# builds along with `--locked`.
@@ -39,7 +42,7 @@ jobs:
3942
echo "CARGO_LOCKED=--locked" >> $GITHUB_ENV
4043
4144
# FIXME: also run petstore integration tests
42-
- name: Run tests
45+
- name: Run default tests
4346
run: cargo ${CARGO_LOCKED} test
4447

4548
clippy-fmt:
@@ -58,12 +61,14 @@ jobs:
5861
- name: Use MSRV lockfile
5962
run: cp Cargo-1.70.lock Cargo.lock
6063

61-
- name: Check fmt
62-
run: cargo --locked fmt --all -- --check
63-
6464
- name: Run Clippy
6565
run: cargo --locked clippy --all -- --deny warnings
6666

67+
# Cargo fmt doesn't run build.rs, so we need to run clippy first in order for
68+
# openapi-lambda-test to pass (since it depends on the .openapi-lambda output directory).
69+
- name: Check fmt
70+
run: cargo --locked fmt --all -- --check
71+
6772
audit:
6873
name: Cargo Audit (stable only)
6974
runs-on: ubuntu-22.04

0 commit comments

Comments
 (0)