From 60c070d7274aa746c4614f93415c5407d2e44f8c Mon Sep 17 00:00:00 2001
From: Magnus Kulke <magnuskulke@microsoft.com>
Date: Wed, 20 Nov 2024 09:48:08 +0100
Subject: [PATCH] ci: use rustlang gh wf to install rust in cdh ci

This will also set up build cache and is consistent with the AA
CI workflow.

drive-by fix: switched to the non-archived rust-lang gh action for AA
and ASR worflows

Signed-off-by: Magnus Kulke <magnuskulke@microsoft.com>
---
 .github/workflows/aa_basic.yml              |  2 +-
 .github/workflows/api-server-rest-basic.yml |  2 +-
 .github/workflows/cdh_basic.yml             | 11 ++++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/aa_basic.yml b/.github/workflows/aa_basic.yml
index 313ab9499..5db2c9d6b 100644
--- a/.github/workflows/aa_basic.yml
+++ b/.github/workflows/aa_basic.yml
@@ -52,7 +52,7 @@ jobs:
           fetch-depth: 1
 
       - name: Install Rust toolchain (${{ matrix.rust }})
-        uses: actions-rs/toolchain@v1
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           profile: minimal
           toolchain: ${{ matrix.rust }}
diff --git a/.github/workflows/api-server-rest-basic.yml b/.github/workflows/api-server-rest-basic.yml
index d42624e51..2482f0567 100644
--- a/.github/workflows/api-server-rest-basic.yml
+++ b/.github/workflows/api-server-rest-basic.yml
@@ -45,7 +45,7 @@ jobs:
           fetch-depth: 1
 
       - name: Install Rust toolchain (${{ matrix.rust }})
-        uses: actions-rs/toolchain@v1
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           profile: minimal
           toolchain: ${{ matrix.rust }}
diff --git a/.github/workflows/cdh_basic.yml b/.github/workflows/cdh_basic.yml
index c8926d172..20d2888e6 100644
--- a/.github/workflows/cdh_basic.yml
+++ b/.github/workflows/cdh_basic.yml
@@ -45,11 +45,12 @@ jobs:
           fetch-depth: 1
 
       - name: Install Rust toolchain (${{ matrix.rust }})
-        run: |
-          rustup update --no-self-update ${{ matrix.rust }}
-          rustup component add --toolchain ${{ matrix.rust }} rustfmt rustc clippy
-          rustup target add x86_64-unknown-linux-gnu
-          rustup default ${{ matrix.rust }}
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          profile: minimal
+          toolchain: ${{ matrix.rust }}
+          override: true
+          components: rustfmt, clippy
 
       - name: Install protoc
         run: |