Check for rustup in CI (in addition to cargo)

smheidrich · Feb 24, 2024 · 7334d95 · 7334d95
1 parent b85c1ac
commit 7334d95
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ci-utils/before-build-mac.sh b/ci-utils/before-build-mac.sh
@@ -13,7 +13,7 @@ mv "$HOST_HOME_DIR/cargo-home-dirs/$ver/.cargo" \
   "$HOST_HOME_DIR/" || true
 
 # check if cargo avail and download if not
-if ! cargo -V; then
+if ! { cargo -V && rustup -V; }; then
   curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 else
   echo "Rust toolchain already installed/restored, not downloading again"

diff --git a/ci-utils/before-build-win.sh b/ci-utils/before-build-win.sh
@@ -13,7 +13,7 @@ mv "$HOST_HOME_DIR_UNIX/cargo-home-dirs/$ver/.cargo" \
   "$HOST_HOME_DIR_UNIX/" || true
 
 # check if cargo avail and download if not
-if ! cargo -V; then
+if ! { cargo -V && rustup -V; }; then
   curl --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 else
   echo "Rust toolchain already installed/restored, not downloading again"