Skip to content

Commit 24958ac

Browse files
committed
Merge remote-tracking branch 'origin/main' into dm/axum-extra-0-12-0
2 parents 914a35a + c4890b8 commit 24958ac

File tree

128 files changed

+2539
-2484
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+2539
-2484
lines changed

.github/workflows/CI.yml

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
check:
1616
runs-on: ubuntu-24.04
1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v5
1919
- uses: dtolnay/rust-toolchain@beta
2020
with:
2121
components: clippy, rustfmt
@@ -30,7 +30,7 @@ jobs:
3030
check-docs:
3131
runs-on: ubuntu-24.04
3232
steps:
33-
- uses: actions/checkout@v4
33+
- uses: actions/checkout@v5
3434
- uses: dtolnay/rust-toolchain@stable
3535
- uses: Swatinem/rust-cache@v2
3636
with:
@@ -50,14 +50,12 @@ jobs:
5050
# Fail the build if there are any warnings
5151
RUSTFLAGS: "-D warnings"
5252
steps:
53-
- uses: actions/checkout@v4
53+
- uses: actions/checkout@v5
5454
- uses: dtolnay/rust-toolchain@stable
5555
- uses: Swatinem/rust-cache@v2
5656
with:
5757
save-if: ${{ github.ref == 'refs/heads/main' }}
58-
- name: Install cargo-hack
59-
run: |
60-
curl -LsSf https://github.com/taiki-e/cargo-hack/releases/latest/download/cargo-hack-x86_64-unknown-linux-gnu.tar.gz | tar xzf - -C ~/.cargo/bin
58+
- uses: taiki-e/install-action@cargo-hack
6159
- name: cargo hack check
6260
run: cargo hack check --each-feature --no-dev-deps --all
6361

@@ -67,7 +65,7 @@ jobs:
6765
matrix:
6866
crate: [axum, axum-core, axum-extra, axum-macros]
6967
steps:
70-
- uses: actions/checkout@v4
68+
- uses: actions/checkout@v5
7169
- uses: dtolnay/rust-toolchain@nightly
7270
- uses: Swatinem/rust-cache@v2
7371
with:
@@ -85,7 +83,7 @@ jobs:
8583
matrix:
8684
rust: [stable, beta]
8785
steps:
88-
- uses: actions/checkout@v4
86+
- uses: actions/checkout@v5
8987
- uses: dtolnay/rust-toolchain@master
9088
with:
9189
toolchain: ${{ matrix.rust }}
@@ -100,7 +98,7 @@ jobs:
10098
needs: check
10199
runs-on: ubuntu-24.04
102100
steps:
103-
- uses: actions/checkout@v4
101+
- uses: actions/checkout@v5
104102
- name: Get rust-toolchain version
105103
id: rust-toolchain
106104
run: echo "version=$(cat axum-macros/rust-toolchain)" >> $GITHUB_OUTPUT
@@ -120,7 +118,7 @@ jobs:
120118
needs: check
121119
runs-on: ubuntu-24.04
122120
steps:
123-
- uses: actions/checkout@v4
121+
- uses: actions/checkout@v5
124122
- uses: dtolnay/rust-toolchain@master
125123
with:
126124
toolchain: ${{ env.MSRV }}
@@ -158,7 +156,7 @@ jobs:
158156
needs: check
159157
runs-on: ubuntu-24.04
160158
steps:
161-
- uses: actions/checkout@v4
159+
- uses: actions/checkout@v5
162160
- uses: dtolnay/rust-toolchain@stable
163161
- uses: Swatinem/rust-cache@v2
164162
with:
@@ -176,7 +174,7 @@ jobs:
176174
- advisories
177175
- bans licenses sources
178176
steps:
179-
- uses: actions/checkout@v4
177+
- uses: actions/checkout@v5
180178
- uses: EmbarkStudios/cargo-deny-action@v2
181179
with:
182180
command: check ${{ matrix.checks }}
@@ -186,7 +184,7 @@ jobs:
186184
needs: check
187185
runs-on: ubuntu-24.04
188186
steps:
189-
- uses: actions/checkout@v4
187+
- uses: actions/checkout@v5
190188
- uses: dtolnay/rust-toolchain@stable
191189
with:
192190
target: armv5te-unknown-linux-musleabi
@@ -212,7 +210,7 @@ jobs:
212210
needs: check
213211
runs-on: ubuntu-24.04
214212
steps:
215-
- uses: actions/checkout@v4
213+
- uses: actions/checkout@v5
216214
- uses: dtolnay/rust-toolchain@stable
217215
with:
218216
target: wasm32-unknown-unknown
@@ -229,28 +227,22 @@ jobs:
229227
dependencies-are-sorted:
230228
runs-on: ubuntu-24.04
231229
steps:
232-
- uses: actions/checkout@v4
233-
- uses: dtolnay/rust-toolchain@beta
234-
- uses: Swatinem/rust-cache@v2
235-
with:
236-
save-if: ${{ github.ref == 'refs/heads/main' }}
230+
- uses: actions/checkout@v5
237231
- name: Install cargo-sort
238-
run: |
239-
cargo install cargo-sort
240-
# Work around cargo-sort not honoring workspace.exclude
241-
- name: Remove non-crate folder
242-
run: rm -rf examples/async-graphql
232+
uses: taiki-e/install-action@v2
233+
with:
234+
tool: cargo-sort@2.0.2
243235
- name: Check dependency tables
244236
run: |
245-
cargo sort --workspace --grouped --check
237+
cargo-sort --workspace --grouped --check
246238
247239
typos:
248240
name: Spell Check with Typos
249241
runs-on: ubuntu-24.04
250242

251243
steps:
252244
- name: Checkout Actions Repository
253-
uses: actions/checkout@v4
245+
uses: actions/checkout@v5
254246

255247
- name: Check the spelling of the files in our repo
256248
uses: crate-ci/typos@v1.29.4

0 commit comments

Comments
 (0)