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

Replace init.sh script with proper rust-toolchain file. #298

Merged
merged 14 commits into from
Mar 30, 2021
11 changes: 4 additions & 7 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,10 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v1

- uses: actions-rs/toolchain@v1
with:
target: wasm32-unknown-unknown
# Toolchain is autodetected from `rust-toolchain` file
# https://github.com/actions-rs/toolchain#the-toolchain-file
#toolchain: ${{ env.WASM_BUILD_TOOLCHAIN }}
default: true
# With rustup's nice new toml format, we just need to run rustup show to install the toolchain
# https://github.com/actions-rs/toolchain/issues/126#issuecomment-782989659
- name: Setup Rust toolchain
run: rustup show

- uses: actions/cache@v2
with:
Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,12 @@ jobs:
with:
path: ${{ runner.tool_cache }}/cargo-sccache
key: ${{ runner.OS }}-sccache-bin-${{ env.CARGO_SCCACHE_VERSION }}-v1
- uses: actions-rs/toolchain@v1
with:
target: wasm32-unknown-unknown
# Toolchain is autodetected from `rust-toolchain` file
# https://github.com/actions-rs/toolchain#the-toolchain-file
#toolchain: ${{ env.WASM_BUILD_TOOLCHAIN }}
default: true

# With rustup's nice new toml format, we just need to run rustup show to install the toolchain
# https://github.com/actions-rs/toolchain/issues/126#issuecomment-782989659
- name: Setup Rust toolchain
run: rustup show

- name: Install sccache
run: |
if [ ! -f ${{ runner.tool_cache }}/cargo-sccache/bin/sccache ]; then
Expand Down
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,6 @@ need a refresher setting up your Substrate environment, see [Substrate's Getting
git clone https://github.com/PureStake/moonbeam
cd moonbeam

# Optional: Ensure you have the exact nightly toolchain used by Moonbeam's CI
./scripts/init.sh

# Build the node (The first build will be long (~30min))
cargo build --release
```
Expand Down
1 change: 0 additions & 1 deletion docker/polkadot-relay.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ RUN sed -i '/sc_executor::WasmExecutionMethod::Interpreted/c\\t\tsc_executor::Wa
# Download rust dependencies and build the rust binary
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y && \
export PATH=$PATH:$HOME/.cargo/bin && \
scripts/init.sh && \
cargo build --$PROFILE --features=real-overseer

# ===== SECOND STAGE ======
Expand Down
6 changes: 5 additions & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
nightly-2021-01-13
[toolchain]
channel = "nightly-2021-01-13"
components = [ "rustfmt", "clippy" ]
targets = [ "wasm32-unknown-unknown" ]
profile = "minimal"
23 changes: 0 additions & 23 deletions scripts/init.sh

This file was deleted.