From 2bc14c3abc93256566fbf73038afe8991ad453cd Mon Sep 17 00:00:00 2001 From: Vivek Pandya Date: Mon, 17 Oct 2022 21:18:52 +0530 Subject: [PATCH] Remove toolchain: input so that rust-toolchain file will be used (#823) * Remove toolchain: input so that rust-toolchain file will be used * Do not use actions-rs for toolchain installtion * Update .github/workflows/benchmark.yml Co-authored-by: Malte Kliemann * Address review comments Co-authored-by: Malte Kliemann --- .github/workflows/benchmark.yml | 13 +++++-------- .github/workflows/migration.yml | 13 +++++-------- .github/workflows/rust.yml | 31 +++++++------------------------ 3 files changed, 17 insertions(+), 40 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index e76afe1f4..e39b9c046 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -33,15 +33,12 @@ jobs: uses: actions/checkout@v2 if: github.event_name == 'workflow_dispatch' + # TODO(#839): `rustup show` installs the rustc version specified in the `rust-toolchain` file + # according to https://rust-lang.github.io/rustup/overrides.html. We don't use actions-rs due + # to the lack of support of `rust-toolchain` files with TOML syntax: + # https://github.com/actions-rs/toolchain/issues/126. - name: Install rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: nightly - target: wasm32-unknown-unknown - default: true - override: true - profile: minimal - components: rustfmt, clippy + run: rustup show - name: Cache dependencies uses: Swatinem/rust-cache@v1 diff --git a/.github/workflows/migration.yml b/.github/workflows/migration.yml index 9be6b411c..02b4857cd 100644 --- a/.github/workflows/migration.yml +++ b/.github/workflows/migration.yml @@ -14,14 +14,11 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 + # TODO(#839): `rustup show` installs the rustc version specified in the `rust-toolchain` file + # according to https://rust-lang.github.io/rustup/overrides.html. We don't use actions-rs due + # to the lack of support of `rust-toolchain` files with TOML syntax: + # https://github.com/actions-rs/toolchain/issues/126. - name: Install rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: nightly - target: wasm32-unknown-unknown - default: true - override: true - profile: minimal - components: rustfmt, clippy + run: rustup show - run: ./scripts/runtime-upgrade/test_runtime_upgrade.sh ${{ github.event.inputs.block }} diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 6f1028942..1c9e643d3 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -17,15 +17,12 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 + # TODO(#839): `rustup show` installs the rustc version specified in the `rust-toolchain` file + # according to https://rust-lang.github.io/rustup/overrides.html. We don't use actions-rs due + # to the lack of support of `rust-toolchain` files with TOML syntax: + # https://github.com/actions-rs/toolchain/issues/126. - name: Install rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: nightly - target: wasm32-unknown-unknown - default: true - override: true - profile: minimal - components: rustfmt + run: rustup show - uses: actions-rs/install@v0.1 with: @@ -50,14 +47,7 @@ jobs: uses: actions/checkout@v2 - name: Install rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: nightly - target: wasm32-unknown-unknown - default: true - override: true - profile: minimal - components: rustfmt, clippy + run: rustup show - name: Cache Dependencies uses: Swatinem/rust-cache@v1 @@ -73,14 +63,7 @@ jobs: uses: actions/checkout@v2 - name: Install rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: nightly - target: wasm32-unknown-unknown - default: true - override: true - profile: minimal - components: rustfmt, clippy + run: rustup show - uses: actions-rs/install@v0.1 with: