From 8902ac2030cf7ef48ec512463424f134a3b38804 Mon Sep 17 00:00:00 2001 From: Hernando Castano Date: Thu, 15 Oct 2020 17:08:01 -0400 Subject: [PATCH] Pin Rust Nightly Version (#420) * Pin nightly to the 2020-10-04 release * Update nightly version in Dockerfiles * Actually install pinned nightly and Wasm utils --- .github/workflows/rust.yml | 12 +++++++++--- Dockerfile | 6 +++--- deployments/rialto/Bridge.Dockerfile | 6 +++--- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 2833f29f1c07b..e962a36773025 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -22,7 +22,7 @@ jobs: toolchain: - stable #- beta - - nightly + - nightly-2020-10-04 runs-on: self-hosted container: image: paritytech/ci-linux:production @@ -44,6 +44,12 @@ jobs: with: fetch-depth: 5 submodules: recursive + - name: Install Toolchain + if: matrix.toolchain == 'nightly-2020-10-04' + run: rustup toolchain add ${{ matrix.toolchain }} + - name: Add WASM Utilities + if: matrix.toolchain == 'nightly-2020-10-04' + run: rustup target add wasm32-unknown-unknown --toolchain ${{ matrix.toolchain }} - name: Configure CARGO_HOME & CARGO_TARGET_DIR run: ./scripts/ci-cache.sh "${{ github.head_ref }}" "${{ matrix.toolchain }}" - name: Cache checking @@ -75,11 +81,11 @@ jobs: ## Linting Stage - name: Add clippy - if: matrix.toolchain == 'nightly' + if: matrix.toolchain == 'nightly-2020-10-04' run: rustup component add clippy --toolchain ${{ matrix.toolchain }} - name: Clippy uses: actions-rs/cargo@master - if: matrix.toolchain == 'nightly' + if: matrix.toolchain == 'nightly-2020-10-04' with: command: clippy toolchain: ${{ matrix.toolchain }} diff --git a/Dockerfile b/Dockerfile index dbba1e7c6ec77..7c6b350fa77c6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,11 +19,11 @@ RUN update-ca-certificates && \ curl https://sh.rustup.rs -sSf | sh -s -- -y ENV PATH="/root/.cargo/bin:${PATH}" -ENV LAST_RUST_UPDATE 2020-09-09 +ENV LAST_RUST_UPDATE 2020-10-15 RUN rustup update stable && \ - rustup install nightly && \ - rustup target add wasm32-unknown-unknown --toolchain nightly + rustup install nightly-2020-10-04 && \ + rustup target add wasm32-unknown-unknown --toolchain nightly-2020-10-04 RUN rustc -vV && \ cargo -V && \ diff --git a/deployments/rialto/Bridge.Dockerfile b/deployments/rialto/Bridge.Dockerfile index cdb5ce31f330f..61685d63bcd83 100644 --- a/deployments/rialto/Bridge.Dockerfile +++ b/deployments/rialto/Bridge.Dockerfile @@ -19,11 +19,11 @@ RUN update-ca-certificates && \ curl https://sh.rustup.rs -sSf | sh -s -- -y ENV PATH="/root/.cargo/bin:${PATH}" -ENV LAST_RUST_UPDATE 2020-09-09 +ENV LAST_RUST_UPDATE 2020-10-15 RUN rustup update stable && \ - rustup install nightly && \ - rustup target add wasm32-unknown-unknown --toolchain nightly + rustup install nightly-2020-10-04 && \ + rustup target add wasm32-unknown-unknown --toolchain nightly-2020-10-04 RUN rustc -vV && \ cargo -V && \