From b1712e28a047ee91d5551a4d66b07e139f813cf3 Mon Sep 17 00:00:00 2001
From: Christian Eltzschig <me@elchris.org>
Date: Mon, 5 Aug 2024 09:13:58 +0200
Subject: [PATCH] [#3] Add cargo as dependency

---
 .github/workflows/build-test.yml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 006025426..b69b171aa 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -58,7 +58,7 @@ jobs:
         uses: dtolnay/rust-toolchain@v1
         with:
           toolchain: stable
-          components: rustfmt, clippy
+          components: rustfmt, clippy, cargo
 
       - name: Run cargo fmt
         run: cargo fmt --all -- --check
@@ -149,7 +149,7 @@ jobs:
         with:
           toolchain: ${{ matrix.toolchain }}
           targets: i686-unknown-linux-gnu
-          components: rustfmt, clippy
+          components: rustfmt, clippy, cargo
 
       - name: Download artifact cargo-nextest
         uses: ./.github/actions/download-cached-rust-tool
@@ -250,7 +250,7 @@ jobs:
         uses: dtolnay/rust-toolchain@v1
         with:
           toolchain: ${{ matrix.toolchain }}
-          components: rustfmt, clippy
+          components: rustfmt, clippy, cargo
 
       - name: Download artifact cargo-nextest
         uses: ./.github/actions/download-cached-rust-tool
@@ -258,6 +258,11 @@ jobs:
           artifact-bin-name: cargo-nextest
           artifact-upload-name: ${{ runner.os }}-cargo-nextest
 
+      - name: Prepare Mac Os
+        if: ${{ matrix.os == 'macos-latest' }}
+        run: |
+          brew remove rust
+          brew remove rustup
       - name: Prepare Windows
         if: ${{ matrix.os == 'windows-latest' }}
         run: internal\scripts\ci_prepare_windows.ps1
@@ -338,7 +343,7 @@ jobs:
         uses: dtolnay/rust-toolchain@v1
         with:
           toolchain: ${{ matrix.toolchain }}
-          components: rustfmt, clippy
+          components: rustfmt, clippy, cargo
 
       - name: Download artifact cargo-nextest
         uses: ./.github/actions/download-cached-rust-tool
@@ -421,7 +426,7 @@ jobs:
       uses: ./.github/actions/build-and-cache-rust-tool
       with:
         rust-toolchain: stable
-        rust-components: llvm-tools-preview
+        rust-components: llvm-tools-preview, cargo
         check-and-install-cmd: grcov --version > /dev/null || cargo install grcov
         print-version-cmd: grcov --version
         cache-key: cache-1-${{ runner.os }}-grcov
@@ -449,7 +454,7 @@ jobs:
       uses: dtolnay/rust-toolchain@v1
       with:
         toolchain: stable
-        components: llvm-tools-preview
+        components: llvm-tools-preview, cargo
 
     - name: Download artifact grcov
       uses: ./.github/actions/download-cached-rust-tool