try a new way to feed active toolchain to the install command

vectordotdev · Mar 4, 2025 · 5d9bb92 · 5d9bb92
1 parent 10c88ad
commit 5d9bb92
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/.github/workflows/msrv.yml b/.github/workflows/msrv.yml
@@ -20,7 +20,6 @@ jobs:
       - run: sudo -E bash scripts/environment/bootstrap-ubuntu-24.04.sh
       - run: |
           # We usually run `scripts/environment/prepare.sh` but in this case we only need the toolchain.
-          TOOLCHAIN="$(rustup show active-toolchain | awk '{print $1;}')"
-          rustup toolchain install "${TOOLCHAIN}"
+          rustup show active-toolchain || rustup toolchain install
       - run: cargo install cargo-msrv --version 0.15.1
       - run: cargo msrv verify
diff --git a/scripts/environment/prepare.sh b/scripts/environment/prepare.sh
@@ -3,8 +3,7 @@ set -e -o verbose
 
 git config --global --add safe.directory /git/vectordotdev/vector
 
-TOOLCHAIN="$(rustup show active-toolchain | awk '{print $1;}')"
-rustup toolchain install "${TOOLCHAIN}"
+rustup show active-toolchain || rustup toolchain install
 rustup show
 if [[ "$(cargo-deb --version)" != "2.0.2" ]] ; then
   rustup run stable cargo install cargo-deb --version 2.0.0 --force --locked