Pin rust nightly version

Works around https://github.com/rust-lang/rust/issues/111320.
This commit is contained in:
Jonas Platte
2023-05-08 10:44:05 +02:00
parent 69c8b9f049
commit 32fafe7be3
5 changed files with 22 additions and 13 deletions

View File

@@ -15,8 +15,9 @@ jobs:
uses: actions/checkout@v3
- name: Install Rust
uses: dtolnay/rust-toolchain@nightly
uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly-2023-05-06
components: rustfmt
- name: Run Benchmarks

View File

@@ -327,8 +327,9 @@ jobs:
uses: actions/checkout@v3
- name: Install Rust
uses: dtolnay/rust-toolchain@nightly
uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly-2023-05-06
components: rustfmt
- name: Cargo fmt
@@ -363,8 +364,9 @@ jobs:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- name: Install Rust
uses: dtolnay/rust-toolchain@nightly
uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly-2023-05-06
components: clippy
- name: Load cache

View File

@@ -20,7 +20,9 @@ jobs:
uses: actions/checkout@v3
- name: Install Rust
uses: dtolnay/rust-toolchain@nightly
uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly-2023-05-06
- name: Install Node.js
uses: actions/setup-node@v3

View File

@@ -78,8 +78,9 @@ jobs:
- uses: actions/checkout@v3
if: "${{ !inputs.tag }}"
- name: Install Rust
uses: dtolnay/rust-toolchain@nightly
uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly-2023-05-06
targets: ${{ matrix.target }}
- name: Install Node.js
uses: actions/setup-node@v3
@@ -114,7 +115,9 @@ jobs:
- uses: actions/checkout@v3
if: "${{ !inputs.tag }}"
- name: Install Rust
uses: dtolnay/rust-toolchain@nightly
uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly-2023-05-06
- name: Install Node.js
uses: actions/setup-node@v3
- name: Build lib

View File

@@ -5,15 +5,16 @@ use xshell::{cmd, pushd};
use crate::{build_docs, workspace, DenyWarnings, Result};
const NIGHTLY: &str = "nightly-2023-05-06";
const WASM_TIMEOUT_ENV_KEY: &str = "WASM_BINDGEN_TEST_TIMEOUT";
const WASM_TIMEOUT_VALUE: &str = "120";
#[derive(Args)]
pub struct CiArgs {
#[clap(subcommand)]
cmd: Option<CiCommand>,
}
const WASM_TIMEOUT_ENV_KEY: &str = "WASM_BINDGEN_TEST_TIMEOUT";
const WASM_TIMEOUT_VALUE: &str = "120";
#[derive(Subcommand)]
enum CiCommand {
/// Check style
@@ -156,7 +157,7 @@ fn check_examples() -> Result<()> {
}
fn check_style() -> Result<()> {
cmd!("rustup run nightly cargo fmt -- --check").run()?;
cmd!("rustup run {NIGHTLY} cargo fmt -- --check").run()?;
Ok(())
}
@@ -168,9 +169,9 @@ fn check_typos() -> Result<()> {
}
fn check_clippy() -> Result<()> {
cmd!("rustup run nightly cargo clippy --all-targets -- -D warnings").run()?;
cmd!("rustup run {NIGHTLY} cargo clippy --all-targets -- -D warnings").run()?;
cmd!(
"rustup run nightly cargo clippy --workspace --all-targets
"rustup run {NIGHTLY} cargo clippy --workspace --all-targets
--exclude matrix-sdk-crypto --exclude xtask
--no-default-features
--features native-tls,experimental-sliding-sync,sso-login,experimental-timeline
@@ -178,7 +179,7 @@ fn check_clippy() -> Result<()> {
)
.run()?;
cmd!(
"rustup run nightly cargo clippy --all-targets -p matrix-sdk-crypto
"rustup run {NIGHTLY} cargo clippy --all-targets -p matrix-sdk-crypto
--no-default-features -- -D warnings"
)
.run()?;