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 <mail@maltekliemann.com> * Address review comments Co-authored-by: Malte Kliemann <mail@maltekliemann.com>
zeitgeistpm · Oct 17, 2022 · 2bc14c3 · 2bc14c3
1 parent f080790
commit 2bc14c3
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 40 deletions.
diff --git 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
@@ -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
@@ -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: