Skip to content

Commit 2169f71

Browse files
authored
Add rust-toolchain.toml file (#6445)
* Add `rust-toolchain.toml` file This file ensures that CI and all developers, by default, use the same Rust version. This helps reduce differences between e.g. `clippy` or `rustfmt` versions. * renovatebot: Keep `rust-toolchain.toml` updated automatically
1 parent 29f605d commit 2169f71

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

.github/renovate.json5

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
":automergeTesters",
1212
"regexManagers:dockerfileVersions",
1313
"regexManagers:githubActionsVersions",
14+
"github>Turbo87/renovate-config//rust/updateToolchain",
1415
],
1516
"js": {
1617
"labels": ["A-frontend 🐹"],

.github/workflows/ci.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ env:
1717
DIESEL_CLI_VERSION: 2.0.1
1818
# renovate: datasource=npm depName=pnpm
1919
PNPM_VERSION: 8.4.0
20-
# renovate: datasource=github-releases depName=rust lookupName=rust-lang/rust
21-
RUST_VERSION: 1.69.0
2220

2321
jobs:
2422
changed-files:
@@ -54,6 +52,7 @@ jobs:
5452
Cargo.lock
5553
Cargo.toml
5654
RustConfig
55+
rust-toolchain.toml
5756
5857
outputs:
5958
non-js: ${{ steps.changed-files-non-js.outputs.any_modified }}
@@ -71,7 +70,6 @@ jobs:
7170
steps:
7271
- uses: actions/[email protected]
7372

74-
- run: rustup default ${{ env.RUST_VERSION }}
7573
- run: rustup component add rustfmt
7674
- run: rustup component add clippy
7775

@@ -110,8 +108,6 @@ jobs:
110108
steps:
111109
- uses: actions/[email protected]
112110

113-
- run: rustup default ${{ env.RUST_VERSION }}
114-
115111
- uses: Swatinem/[email protected]
116112

117113
- run: cargo install diesel_cli --vers ${{ env.DIESEL_CLI_VERSION }} --no-default-features --features postgres --debug

rust-toolchain.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[toolchain]
2+
channel = "1.69.0"

0 commit comments

Comments
 (0)