Align curl and rustup-init flags between windows and non-windows

This commit is contained in:
David Tolnay 2025-04-29 11:36:50 -07:00
parent 9ec87f110c
commit 1c80aedd72
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82

View file

@ -69,7 +69,7 @@ runs:
- run: |
: install rustup if needed
if ! command -v rustup &>/dev/null; then
curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused --location --silent --show-error --fail "https://sh.rustup.rs" | sh -s -- --default-toolchain none -y
curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused --location --silent --show-error --fail https://sh.rustup.rs | sh -s -- --default-toolchain none -y
echo "$CARGO_HOME/bin" >> $GITHUB_PATH
fi
if: runner.os != 'Windows'
@ -78,9 +78,9 @@ runs:
- run: |
: install rustup if needed on windows
if ! command -v rustup &>/dev/null; then
curl -LOs https://static.rust-lang.org/rustup/dist/${{ runner.arch == 'ARM64' && 'aarch64' || 'x86_64' }}-pc-windows-msvc/rustup-init.exe
./rustup-init.exe -y --default-toolchain none --no-modify-path
echo "$USERPROFILE/.cargo/bin" >> "$GITHUB_PATH"
curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused --location --silent --show-error --fail --remote-name https://static.rust-lang.org/rustup/dist/${{ runner.arch == 'ARM64' && 'aarch64' || 'x86_64' }}-pc-windows-msvc/rustup-init.exe
./rustup-init.exe --default-toolchain none --no-modify-path -y
echo "$USERPROFILE/.cargo/bin" >> $GITHUB_PATH
fi
if: runner.os == 'Windows'
shell: bash