Skip to content

Commit 32a5c01

Browse files
authored
Merge pull request #10536 from Byron/fix
Pin the stable version to whatever the latest CI image contains!
2 parents 7e1130a + 908115f commit 32a5c01

File tree

4 files changed

+10
-2
lines changed

4 files changed

+10
-2
lines changed

.github/workflows/publish.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
name: 'Publish'
2+
env:
3+
RUSTUP_TOOLCHAIN: stable
24
on:
35
schedule:
46
# every day at 3am

.github/workflows/push.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77

88
env:
99
RUST_BACKTRACE: full
10+
RUSTUP_TOOLCHAIN: stable
1011

1112
concurrency:
1213
group: ${{ github.workflow }}-${{ github.ref }}
@@ -169,7 +170,9 @@ jobs:
169170
env:
170171
GITBUTLER_TESTS_NO_CLEANUP: '1'
171172
name: cargo test
172-
- run: cargo clippy --workspace --all-targets -- -D warnings
173+
- run: |
174+
rustup component add clippy
175+
cargo clippy --workspace --all-targets -- -D warnings
173176
name: cargo clippy
174177
- run: |
175178
set -e

.github/workflows/test-e2e-blackbox.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
name: E2E Blackbox Tests
2+
env:
3+
RUSTUP_TOOLCHAIN: stable
24
on:
35
pull_request:
46
branches: [master]

rust-toolchain.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[toolchain]
2-
channel = "stable"
2+
# IMPORTANT: This should match CI so it won't download the toolchain all the time.
3+
channel = "1.90"
34
components = [
45
"rustfmt",
56
"clippy",

0 commit comments

Comments
 (0)