Skip to content

Commit 32fafe7

Browse files
committed
Pin rust nightly version
Works around rust-lang/rust#111320.
1 parent 69c8b9f commit 32fafe7

File tree

5 files changed

+22
-13
lines changed

5 files changed

+22
-13
lines changed

.github/workflows/benchmarks.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ jobs:
1515
uses: actions/checkout@v3
1616

1717
- name: Install Rust
18-
uses: dtolnay/rust-toolchain@nightly
18+
uses: dtolnay/rust-toolchain@master
1919
with:
20+
toolchain: nightly-2023-05-06
2021
components: rustfmt
2122

2223
- name: Run Benchmarks

.github/workflows/ci.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -327,8 +327,9 @@ jobs:
327327
uses: actions/checkout@v3
328328

329329
- name: Install Rust
330-
uses: dtolnay/rust-toolchain@nightly
330+
uses: dtolnay/rust-toolchain@master
331331
with:
332+
toolchain: nightly-2023-05-06
332333
components: rustfmt
333334

334335
- name: Cargo fmt
@@ -363,8 +364,9 @@ jobs:
363364
repo-token: ${{ secrets.GITHUB_TOKEN }}
364365

365366
- name: Install Rust
366-
uses: dtolnay/rust-toolchain@nightly
367+
uses: dtolnay/rust-toolchain@master
367368
with:
369+
toolchain: nightly-2023-05-06
368370
components: clippy
369371

370372
- name: Load cache

.github/workflows/documentation.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ jobs:
2020
uses: actions/checkout@v3
2121

2222
- name: Install Rust
23-
uses: dtolnay/rust-toolchain@nightly
23+
uses: dtolnay/rust-toolchain@master
24+
with:
25+
toolchain: nightly-2023-05-06
2426

2527
- name: Install Node.js
2628
uses: actions/setup-node@v3

.github/workflows/release-crypto-nodejs.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,9 @@ jobs:
7878
- uses: actions/checkout@v3
7979
if: "${{ !inputs.tag }}"
8080
- name: Install Rust
81-
uses: dtolnay/rust-toolchain@nightly
81+
uses: dtolnay/rust-toolchain@master
8282
with:
83+
toolchain: nightly-2023-05-06
8384
targets: ${{ matrix.target }}
8485
- name: Install Node.js
8586
uses: actions/setup-node@v3
@@ -114,7 +115,9 @@ jobs:
114115
- uses: actions/checkout@v3
115116
if: "${{ !inputs.tag }}"
116117
- name: Install Rust
117-
uses: dtolnay/rust-toolchain@nightly
118+
uses: dtolnay/rust-toolchain@master
119+
with:
120+
toolchain: nightly-2023-05-06
118121
- name: Install Node.js
119122
uses: actions/setup-node@v3
120123
- name: Build lib

xtask/src/ci.rs

+8-7
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,16 @@ use xshell::{cmd, pushd};
55

66
use crate::{build_docs, workspace, DenyWarnings, Result};
77

8+
const NIGHTLY: &str = "nightly-2023-05-06";
9+
const WASM_TIMEOUT_ENV_KEY: &str = "WASM_BINDGEN_TEST_TIMEOUT";
10+
const WASM_TIMEOUT_VALUE: &str = "120";
11+
812
#[derive(Args)]
913
pub struct CiArgs {
1014
#[clap(subcommand)]
1115
cmd: Option<CiCommand>,
1216
}
1317

14-
const WASM_TIMEOUT_ENV_KEY: &str = "WASM_BINDGEN_TEST_TIMEOUT";
15-
const WASM_TIMEOUT_VALUE: &str = "120";
16-
1718
#[derive(Subcommand)]
1819
enum CiCommand {
1920
/// Check style
@@ -156,7 +157,7 @@ fn check_examples() -> Result<()> {
156157
}
157158

158159
fn check_style() -> Result<()> {
159-
cmd!("rustup run nightly cargo fmt -- --check").run()?;
160+
cmd!("rustup run {NIGHTLY} cargo fmt -- --check").run()?;
160161
Ok(())
161162
}
162163

@@ -168,17 +169,17 @@ fn check_typos() -> Result<()> {
168169
}
169170

170171
fn check_clippy() -> Result<()> {
171-
cmd!("rustup run nightly cargo clippy --all-targets -- -D warnings").run()?;
172+
cmd!("rustup run {NIGHTLY} cargo clippy --all-targets -- -D warnings").run()?;
172173
cmd!(
173-
"rustup run nightly cargo clippy --workspace --all-targets
174+
"rustup run {NIGHTLY} cargo clippy --workspace --all-targets
174175
--exclude matrix-sdk-crypto --exclude xtask
175176
--no-default-features
176177
--features native-tls,experimental-sliding-sync,sso-login,experimental-timeline
177178
-- -D warnings"
178179
)
179180
.run()?;
180181
cmd!(
181-
"rustup run nightly cargo clippy --all-targets -p matrix-sdk-crypto
182+
"rustup run {NIGHTLY} cargo clippy --all-targets -p matrix-sdk-crypto
182183
--no-default-features -- -D warnings"
183184
)
184185
.run()?;

0 commit comments

Comments
 (0)