From 66866728981008f866d569efec3d035cba4a032e Mon Sep 17 00:00:00 2001 From: Nazar Mokrynskyi Date: Thu, 24 Mar 2022 15:07:12 +0200 Subject: [PATCH] Fix Rust nightly version to un-break CI, minor docs tweaks (no need to install compiler manually, we have toolchain file for that) --- .github/workflows/rust.yaml | 6 +++--- .github/workflows/rustdoc.yml | 2 +- .github/workflows/snapshot-build.yml | 2 +- Dockerfile-farmer | 2 +- Dockerfile-node | 2 +- crates/subspace-farmer/README.md | 7 +------ rust-toolchain.toml | 2 +- 7 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.github/workflows/rust.yaml b/.github/workflows/rust.yaml index 5989db4ccb20a..99831ecf18bcd 100644 --- a/.github/workflows/rust.yaml +++ b/.github/workflows/rust.yaml @@ -29,7 +29,7 @@ jobs: uses: actions-rs/toolchain@v1 # TODO: Below can be removed when https://github.com/actions-rs/toolchain/issues/126 is resolved with: - toolchain: nightly + toolchain: nightly-2022-02-15 target: wasm32-unknown-unknown override: true components: rustfmt, clippy @@ -73,7 +73,7 @@ jobs: uses: actions-rs/toolchain@v1 # TODO: Below can be removed when https://github.com/actions-rs/toolchain/issues/126 is resolved with: - toolchain: nightly + toolchain: nightly-2022-02-15 target: wasm32-unknown-unknown override: true components: rustfmt, clippy @@ -134,7 +134,7 @@ jobs: uses: actions-rs/toolchain@v1 # TODO: Below can be removed when https://github.com/actions-rs/toolchain/issues/126 is resolved with: - toolchain: nightly + toolchain: nightly-2022-02-15 target: wasm32-unknown-unknown override: true components: rustfmt, clippy diff --git a/.github/workflows/rustdoc.yml b/.github/workflows/rustdoc.yml index 5107e3854602c..8359112833839 100644 --- a/.github/workflows/rustdoc.yml +++ b/.github/workflows/rustdoc.yml @@ -21,7 +21,7 @@ jobs: - name: Install Rust toolchain uses: actions-rs/toolchain@v1 with: - toolchain: nightly + toolchain: nightly-2022-02-15 target: wasm32-unknown-unknown profile: minimal override: true diff --git a/.github/workflows/snapshot-build.yml b/.github/workflows/snapshot-build.yml index 34cd8aad846b8..05387c1ea01a8 100644 --- a/.github/workflows/snapshot-build.yml +++ b/.github/workflows/snapshot-build.yml @@ -118,7 +118,7 @@ jobs: uses: actions-rs/toolchain@v1 # TODO: Below can be removed when https://github.com/actions-rs/toolchain/issues/126 is resolved with: - toolchain: nightly + toolchain: nightly-2022-02-15 target: wasm32-unknown-unknown override: true diff --git a/Dockerfile-farmer b/Dockerfile-farmer index d32fc5a1aff12..7bb9bff8d1564 100644 --- a/Dockerfile-farmer +++ b/Dockerfile-farmer @@ -1,6 +1,6 @@ FROM ubuntu:20.04 -ARG RUSTC_VERSION=nightly +ARG RUSTC_VERSION=nightly-2022-02-15 WORKDIR /code diff --git a/Dockerfile-node b/Dockerfile-node index 7b17d90945136..a8545446587dc 100644 --- a/Dockerfile-node +++ b/Dockerfile-node @@ -1,6 +1,6 @@ FROM ubuntu:20.04 -ARG RUSTC_VERSION=nightly +ARG RUSTC_VERSION=nightly-2022-02-15 WORKDIR /code diff --git a/crates/subspace-farmer/README.md b/crates/subspace-farmer/README.md index d00c24cfec287..a573bc302ca29 100644 --- a/crates/subspace-farmer/README.md +++ b/crates/subspace-farmer/README.md @@ -39,12 +39,7 @@ sudo apt-get install llvm clang Then install the framer using Cargo: ``` -cargo +nightly install subspace-farmer -``` - -NOTE: Above command requires nightly compiler for now, make sure to install it if you don't have one yet: -``` -rustup toolchain install nightly +cargo install subspace-farmer ``` ## Usage diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 17ce332ff707e..6d02c4a83a62e 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "nightly" +channel = "nightly-2022-02-15" targets = ["wasm32-unknown-unknown"] profile = "default"