From 63e12a753f12c39ef7e15ba7632691d87a92b57d Mon Sep 17 00:00:00 2001
From: "markin.io" <markin.io210@gmail.com>
Date: Thu, 27 Apr 2023 17:00:23 +0100
Subject: [PATCH] build: return proper Rust setup

---
 .github/workflows/all-packages.yml |  6 ++----
 .github/workflows/js-checks.yml    |  6 ++----
 .github/workflows/release.yml      |  6 ++----
 .github/workflows/rs-checks.yml    | 12 ++++--------
 .github/workflows/rs-drive.yml     |  3 +--
 .github/workflows/wasm-dpp.yml     |  3 +--
 6 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/all-packages.yml b/.github/workflows/all-packages.yml
index f29f9b5e2f5..0dfe349b2b7 100644
--- a/.github/workflows/all-packages.yml
+++ b/.github/workflows/all-packages.yml
@@ -86,8 +86,7 @@ jobs:
           node-version: "16"
 
       - name: Setup Rust
-        # TODO(v0.24-backport): replace with `uses: ./.github/actions/rust`?
-        uses: dtolnay/rust-toolchain@master
+        uses: ./.github/actions/rust
         with:
           toolchain: stable
           target: wasm32-unknown-unknown
@@ -280,8 +279,7 @@ jobs:
           config-file: ./.github/codeql/codeql-config.yml
 
       - name: Setup Rust
-        # TODO(v0.24-backport): use `uses: ./.github/actions/rust`?
-        uses: dtolnay/rust-toolchain@master
+        uses: ./.github/actions/rust
         with:
           toolchain: stable
           target: wasm32-unknown-unknown
diff --git a/.github/workflows/js-checks.yml b/.github/workflows/js-checks.yml
index bc7cf35c00f..9e0a9520f04 100644
--- a/.github/workflows/js-checks.yml
+++ b/.github/workflows/js-checks.yml
@@ -48,8 +48,7 @@ jobs:
           node-version: "16"
 
       - name: Setup Rust
-        # TODO(v0.24-backport): use `uses: ./.github/actions/rust`?
-        uses: dtolnay/rust-toolchain@master
+        uses: ./.github/actions/rust
         with:
           toolchain: stable
           target: wasm32-unknown-unknown
@@ -121,8 +120,7 @@ jobs:
           node-version: "16"
 
       - name: Setup Rust
-        # TODO(v0.24-backport): use `uses: ./.github/actions/rust`?
-        uses: dtolnay/rust-toolchain@master
+        uses: ./.github/actions/rust
         with:
           toolchain: stable
           target: wasm32-unknown-unknown
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 66890bf3284..28d43620bd6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -35,8 +35,7 @@ jobs:
           TAG_PREFIX: v
 
       - name: Setup Rust
-        # TODO(v0.24-backport): use `uses: ./.github/actions/rust`?
-        uses: dtolnay/rust-toolchain@master
+        uses: ./.github/actions/rust
         with:
           toolchain: stable
           target: wasm32-unknown-unknown
@@ -915,8 +914,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: '16'
-      # TODO(v0.24-backport): use `uses: ./.github/actions/rust`?
-      - uses: dtolnay/rust-toolchain@master
+      - uses: ./.github/actions/rust
         with:
           toolchain: stable
           target: wasm32-unknown-unknown
diff --git a/.github/workflows/rs-checks.yml b/.github/workflows/rs-checks.yml
index 9ed1b56200f..0be2f2f3ee1 100644
--- a/.github/workflows/rs-checks.yml
+++ b/.github/workflows/rs-checks.yml
@@ -22,8 +22,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Rust
-        # TODO(v0.24-backport): use `uses: ./.github/actions/rust`?
-        uses: dtolnay/rust-toolchain@master
+        uses: ./.github/actions/rust
         with:
           toolchain: stable
           components: clippy
@@ -54,8 +53,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Rust
-        # TODO(v0.24-backport): use `uses: ./.github/actions/rust`?
-        uses: dtolnay/rust-toolchain@master
+        uses: ./.github/actions/rust
         with:
           toolchain: stable
           components: rustfmt
@@ -76,8 +74,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Rust
-        # TODO(v0.24-backport): use `uses: ./.github/actions/rust`?
-        uses: dtolnay/rust-toolchain@master
+        uses: ./.github/actions/rust
         with:
           toolchain: stable
           target: wasm32-unknown-unknown
@@ -110,8 +107,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Rust
-        # TODO(v0.24-backport): use `uses: ./.github/actions/rust`?
-        uses: dtolnay/rust-toolchain@master
+        uses: ./.github/actions/rust
         with:
           toolchain: stable
           target: wasm32-unknown-unknown
diff --git a/.github/workflows/rs-drive.yml b/.github/workflows/rs-drive.yml
index 06fa3a037ae..3e3ff1bc2d3 100644
--- a/.github/workflows/rs-drive.yml
+++ b/.github/workflows/rs-drive.yml
@@ -35,8 +35,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Rust
-        # TODO(v0.24-backport): use `uses: ./.github/actions/rust`?
-        uses: dtolnay/rust-toolchain@master
+        uses: ./.github/actions/rust
         with:
           toolchain: stable
           target: wasm32-unknown-unknown
diff --git a/.github/workflows/wasm-dpp.yml b/.github/workflows/wasm-dpp.yml
index 37dc0bd3258..148e1252e14 100644
--- a/.github/workflows/wasm-dpp.yml
+++ b/.github/workflows/wasm-dpp.yml
@@ -51,8 +51,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Rust
-        # TODO(v0.24-backport): use `uses: ./.github/actions/rust`?
-        uses: dtolnay/rust-toolchain@master
+        uses: ./.github/actions/rust
         with:
           toolchain: stable
           target: wasm32-unknown-unknown