Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove rustup #2642

Merged
merged 2 commits into from
Nov 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,4 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \

USER vscode

RUN rustup default nightly-2023-04-15 && \
rustup target add wasm32-unknown-unknown --toolchain nightly-2023-04-15

RUN rustup component add rustfmt

RUN git config --global submodule.recurse true
8 changes: 1 addition & 7 deletions .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,7 @@ jobs:
~/.cargo/git/db/
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- name: Install toolchain
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: nightly-2023-04-15
components: rustfmt
target: wasm32-unknown-unknown
default: true
uses: dtolnay/rust-toolchain@nightly
- name: Install weight-gen
run: cargo install --git https://github.com/open-web3-stack/wasm-bencher.git --bin weight-gen --force
- name: Setup cmake
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
# Build WASM with Substrate Runtime Tool
- name: Srtool build
id: srtool_build
uses: chevdor/srtool-actions@v0.7.0
uses: chevdor/srtool-actions@v0.9.0
env:
BUILD_OPTS: "--features on-chain-release-build,no-metadata-docs"
with:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ jobs:
run: cargo +nightly fmt --all -- --check
- name: Build
run: make build-all
- name: Install clippy
run: rustup component add clippy
- name: Run mandala-runtime clippy
run: cargo clippy --features with-mandala-runtime -- -D warnings
- name: Run karura-runtime clippy
Expand Down
109 changes: 0 additions & 109 deletions .github/workflows/test.yml.src

This file was deleted.

3 changes: 0 additions & 3 deletions scripts/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
FROM rust:buster as builder
WORKDIR /app

RUN rustup default nightly-2023-04-15 && \
rustup target add wasm32-unknown-unknown --toolchain nightly-2023-04-15

RUN apt-get update && \
apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \
apt-get install -y cmake pkg-config libssl-dev git clang libclang-dev protobuf-compiler
Expand Down
4 changes: 2 additions & 2 deletions scripts/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ set -e

echo "*** Initializing WASM build environment"

rustup default nightly-2023-04-15
rustup component add rustfmt --toolchain nightly

rustup target add wasm32-unknown-unknown --toolchain nightly-2023-04-15
rustup show
3 changes: 0 additions & 3 deletions scripts/profiling/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
FROM rust:buster as builder
WORKDIR /app

RUN rustup default nightly-2023-04-15 && \
rustup target add wasm32-unknown-unknown --toolchain nightly-2023-04-15

RUN apt-get update && \
apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \
apt-get install -y cmake pkg-config libssl-dev git clang libclang-dev protobuf-compiler
Expand Down
Loading