Skip to content

Commit d9cb546

Browse files
Merge pull request #2673 from saschagrunert/rust-latest
Use latest Rust toolchain
2 parents 257395d + 36b6826 commit d9cb546

File tree

3 files changed

+5
-18
lines changed

3 files changed

+5
-18
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ on:
99
env:
1010
CARGO_TERM_COLOR: always
1111
GO_VERSION: "1.24"
12-
ACTION_MSRV_TOOLCHAIN: 1.88.0
1312
NIX_VERSION: "2.30.1"
1413
jobs:
1514
build:
@@ -29,7 +28,7 @@ jobs:
2928
- name: Select Toolchain
3029
uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
3130
with:
32-
toolchain: ${{ env['ACTION_MSRV_TOOLCHAIN'] }}
31+
toolchain: stable
3332
components: rustfmt
3433
- run: cargo build && git diff --exit-code
3534

@@ -80,10 +79,7 @@ jobs:
8079
- name: Select Toolchain
8180
uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
8281
with:
83-
# Ubuntu 22.04 glibc static is not compatible with rustc 1.58.1 (see
84-
# ACTION_MSRV_TOOLCHAIN). Means we now just use the latest one, since
85-
# the static builds are made for the community.
86-
toolchain: ${{ env['ACTION_MSRV_TOOLCHAIN'] }}
82+
toolchain: stable
8783
components: rustfmt
8884
- run: make release-static
8985
- run: |
@@ -203,7 +199,7 @@ jobs:
203199
- name: Select Toolchain
204200
uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
205201
with:
206-
toolchain: ${{ env['ACTION_MSRV_TOOLCHAIN'] }}
202+
toolchain: stable
207203
components: rustfmt
208204
- name: Cargo doc
209205
run: cargo doc --no-deps
@@ -238,7 +234,7 @@ jobs:
238234
- name: Select Toolchain
239235
uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
240236
with:
241-
toolchain: ${{ env['ACTION_MSRV_TOOLCHAIN'] }}
237+
toolchain: stable
242238
components: rustfmt
243239
- name: Rustfmt
244240
run: cargo fmt && git diff --exit-code

.github/workflows/release.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ on:
88
env:
99
CARGO_TERM_COLOR: always
1010
GO_VERSION: "1.24"
11-
ACTION_MSRV_TOOLCHAIN: 1.88.0
1211

1312
jobs:
1413
build:
@@ -31,7 +30,7 @@ jobs:
3130
- name: Select Toolchain
3231
uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
3332
with:
34-
toolchain: ${{ env['ACTION_MSRV_TOOLCHAIN'] }}
33+
toolchain: stable
3534
components: rustfmt
3635
- name: Build
3736
run: cargo build

dependencies.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,6 @@ dependencies:
1010
- path: .github/workflows/release.yml
1111
match: GO_VERSION
1212

13-
- name: rust
14-
version: 1.88.0
15-
refPaths:
16-
- path: .github/workflows/ci.yml
17-
match: ACTION_MSRV_TOOLCHAIN
18-
- path: .github/workflows/release.yml
19-
match: ACTION_MSRV_TOOLCHAIN
20-
2113
- name: golangci-lint
2214
version: 2.2.2
2315
refPaths:

0 commit comments

Comments
 (0)