Browse Source

Merge pull request #2293 from mnaamani/upgrade_runtime&node_to_v2.0.1

rust 1.51 - Upgrade runtime&node to v2.0.1
shamil-gadelshin 4 years ago
parent
commit
54ab94668a
4 changed files with 12 additions and 12 deletions
  1. 1 1
      devops/git-hooks/pre-push
  2. 6 6
      joystream-node.Dockerfile
  3. 1 1
      scripts/cargo-build.sh
  4. 4 4
      setup.sh

+ 1 - 1
devops/git-hooks/pre-push

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-export WASM_BUILD_TOOLCHAIN=nightly-2020-10-06
+export WASM_BUILD_TOOLCHAIN=nightly-2021-02-20
 
 echo 'running clippy (rust linter)'
 # When custom build.rs triggers wasm-build-runner-impl to build we get error:

+ 6 - 6
joystream-node.Dockerfile

@@ -1,9 +1,9 @@
-FROM liuchong/rustup:1.47.0 AS rustup
+FROM liuchong/rustup:1.51.0 AS rustup
 RUN rustup component add rustfmt clippy
-RUN rustup install nightly-2020-10-06 --force
-RUN rustup target add wasm32-unknown-unknown --toolchain nightly-2020-10-06
+RUN rustup install nightly-2021-02-20 --force
+RUN rustup target add wasm32-unknown-unknown --toolchain nightly-2021-02-20
 RUN apt-get update && \
-  apt-get install -y curl git gcc xz-utils sudo pkg-config unzip clang libc6-dev-i386
+  apt-get install -y curl git gcc xz-utils sudo pkg-config unzip clang libc6-dev
 
 FROM rustup AS builder
 LABEL description="Compiles all workspace artifacts"
@@ -12,12 +12,12 @@ COPY . /joystream
 
 # Build all cargo crates
 # Ensure our tests and linter pass before actual build
-ENV WASM_BUILD_TOOLCHAIN=nightly-2020-10-06
+ENV WASM_BUILD_TOOLCHAIN=nightly-2021-02-20
 RUN BUILD_DUMMY_WASM_BINARY=1 cargo clippy --release --all -- -D warnings && \
     cargo test --release --all && \
     cargo build --release
 
-FROM debian:stretch
+FROM debian:buster
 LABEL description="Joystream node"
 WORKDIR /joystream
 COPY --from=builder /joystream/target/release/joystream-node /joystream/node

+ 1 - 1
scripts/cargo-build.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
-export WASM_BUILD_TOOLCHAIN=nightly-2020-10-06
+export WASM_BUILD_TOOLCHAIN=nightly-2021-02-20
 
 cargo build --release

+ 4 - 4
setup.sh

@@ -27,11 +27,11 @@ source ~/.cargo/env
 
 rustup component add rustfmt clippy
 
-rustup install nightly-2020-10-06
-rustup target add wasm32-unknown-unknown --toolchain nightly-2020-10-06
+rustup install nightly-2021-02-20
+rustup target add wasm32-unknown-unknown --toolchain nightly-2021-02-20
 
-rustup install 1.47.0
-rustup default 1.47.0
+rustup install 1.51.0
+rustup default 1.51.0
 
 # Volta nodejs, npm, yarn tools manager
 curl https://get.volta.sh | bash