mirror of
https://github.com/curl/curl.git
synced 2026-08-05 03:36:14 +03:00
CI: sync curl download command-line options
- circleci: pipe to tar. - use long options uniformly. - sync option order. - set timeout where missing. - set retry where missing. - set `--retry-connrefused` where missing. - set `--disable` where missing. - lower 999s timeouts to 120s. Closes #17851
This commit is contained in:
parent
067bc8ee2d
commit
9ff2127105
4 changed files with 30 additions and 27 deletions
8
.github/workflows/non-native.yml
vendored
8
.github/workflows/non-native.yml
vendored
|
|
@ -347,8 +347,8 @@ jobs:
|
|||
- name: 'build libressl'
|
||||
if: ${{ contains(matrix.build.install_steps, 'libressl') && steps.cache-libressl.outputs.cache-hit != 'true' }}
|
||||
run: |
|
||||
curl -LsSf --retry 6 --retry-connrefused --max-time 999 \
|
||||
"https://github.com/libressl/portable/releases/download/v${LIBRESSL_VERSION}/libressl-${LIBRESSL_VERSION}.tar.gz" | tar -x
|
||||
curl --disable --fail --silent --show-error --connect-timeout 15 --max-time 60 --retry 3 --retry-connrefused \
|
||||
--location "https://github.com/libressl/portable/releases/download/v${LIBRESSL_VERSION}/libressl-${LIBRESSL_VERSION}.tar.gz" | tar -x
|
||||
cd "libressl-${LIBRESSL_VERSION}"
|
||||
# FIXME: on the 4.0.1 release, delete '-DHAVE_ENDIAN_H=0'
|
||||
cmake -B . -G Ninja \
|
||||
|
|
@ -549,11 +549,11 @@ jobs:
|
|||
if: ${{ steps.cache-compiler.outputs.cache-hit != 'true' }}
|
||||
run: |
|
||||
cd ~
|
||||
curl --disable --fail --silent --show-error --connect-timeout 15 --max-time 120 --retry 3 \
|
||||
curl --disable --fail --silent --show-error --connect-timeout 15 --max-time 120 --retry 3 --retry-connrefused \
|
||||
--location "https://github.com/andrewwutw/build-djgpp/releases/download/v${TOOLCHAIN_VERSION}/djgpp-linux64-gcc1220.tar.bz2" | tar -xj
|
||||
cd djgpp
|
||||
for f in wat3211b.zip zlb13b.zip ssl102ub.zip; do
|
||||
curl --disable --fail --silent --show-error --connect-timeout 15 --max-time 60 --retry 3 \
|
||||
curl --disable --fail --silent --show-error --connect-timeout 15 --max-time 60 --retry 3 --retry-connrefused \
|
||||
"https://www.delorie.com/pub/djgpp/current/v2tk/$f" --output bin.zip
|
||||
unzip -q bin.zip
|
||||
rm -f bin.zip
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue