From b3b42f49d461ccf76cd7d1ac9320b7263bb5eafe Mon Sep 17 00:00:00 2001
From: Jonathan Schwender <55576758+jschwe@users.noreply.github.com>
Date: Fri, 17 May 2024 13:28:57 +0200
Subject: [PATCH] CI: Respect selected toolchain (#291)

The rust toolchain file overrides the Rust version selected in CI.
To allow testing different rust versions in CI, respect the toolchain
defined in CI.
---
 .github/workflows/main.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 002ff5d0..7acfd130 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -49,6 +49,7 @@ jobs:
         sudo apt update
         sudo apt install gcc libxxf86vm-dev libosmesa6-dev libgles2-mesa-dev -y
     - name: Install rust
+      id: toolchain
       uses: dtolnay/rust-toolchain@master
       with:
           toolchain: ${{ matrix.rust }}
@@ -56,20 +57,20 @@ jobs:
       if: matrix.target != 'default' && startsWith(matrix.target, 'aarch64-uwp-windows-msvc') != true
       run: |
         cd surfman
-        rustup target add ${{ matrix.target }}
-        cargo build --verbose ${{ matrix.features }} --target=${{ matrix.target }}
+        rustup +${{steps.toolchain.outputs.name}} target add ${{ matrix.target }}
+        cargo +${{steps.toolchain.outputs.name}} build --verbose ${{ matrix.features }} --target=${{ matrix.target }}
     - name: Build
       if: matrix.target == 'default'
       run: |
         cd surfman
-        cargo build --verbose ${{ matrix.features }}
+        cargo +${{steps.toolchain.outputs.name}} build --verbose ${{ matrix.features }}
     - name: Build Windows
       if: startsWith(matrix.target, 'aarch64-uwp-windows-msvc')
       shell: cmd
       run: |
         cd surfman
-        rustup component add rust-src --target=aarch64-uwp-windows-msvc
-        cargo build -Z build-std --verbose --target=aarch64-uwp-windows-msvc
+        rustup +${{steps.toolchain.outputs.name}} component add rust-src --target=aarch64-uwp-windows-msvc
+        cargo +${{steps.toolchain.outputs.name}} build -Z build-std --verbose --target=aarch64-uwp-windows-msvc
   Format:
     name: Run `rustfmt`
     runs-on: ubuntu-latest