Skip to content

Commit

Permalink
Pin Rust Nightly Version (#420)
Browse files Browse the repository at this point in the history
* Pin nightly to the 2020-10-04 release

* Update nightly version in Dockerfiles

* Actually install pinned nightly and Wasm utils
  • Loading branch information
HCastano authored Oct 15, 2020
1 parent b45d685 commit 8902ac2
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
12 changes: 9 additions & 3 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
toolchain:
- stable
#- beta
- nightly
- nightly-2020-10-04
runs-on: self-hosted
container:
image: paritytech/ci-linux:production
Expand All @@ -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
Expand Down Expand Up @@ -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 }}
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
6 changes: 3 additions & 3 deletions deployments/rialto/Bridge.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down

0 comments on commit 8902ac2

Please sign in to comment.