Merge pull request #146 from dtolnay/flags

Align curl and rustup-init flags between windows and non-windows
This commit is contained in:
David Tolnay 2025-04-29 11:39:38 -07:00 committed by GitHub
commit 1901dba34d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -69,7 +69,7 @@ runs:
- run: | - run: |
: install rustup if needed : install rustup if needed
if ! command -v rustup &>/dev/null; then 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 echo "$CARGO_HOME/bin" >> $GITHUB_PATH
fi fi
if: runner.os != 'Windows' if: runner.os != 'Windows'
@ -78,9 +78,9 @@ runs:
- run: | - run: |
: install rustup if needed on windows : install rustup if needed on windows
if ! command -v rustup &>/dev/null; then 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 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 -y --default-toolchain none --no-modify-path ./rustup-init.exe --default-toolchain none --no-modify-path -y
echo "$USERPROFILE/.cargo/bin" >> "$GITHUB_PATH" echo "$USERPROFILE/.cargo/bin" >> $GITHUB_PATH
fi fi
if: runner.os == 'Windows' if: runner.os == 'Windows'
shell: bash shell: bash