mirror of
https://github.com/actions/runner.git
synced 2025-12-12 15:13:30 +00:00
Patch Curl to no longer use -k (#3091)
* Update externals.sh * Update externals.sh
This commit is contained in:
@@ -63,17 +63,16 @@ function acquireExternalTool() {
|
|||||||
echo "Curl version: $CURL_VERSION"
|
echo "Curl version: $CURL_VERSION"
|
||||||
|
|
||||||
# curl -f Fail silently (no output at all) on HTTP errors (H)
|
# curl -f Fail silently (no output at all) on HTTP errors (H)
|
||||||
# -k Allow connections to SSL sites without certs (H)
|
|
||||||
# -S Show error. With -s, make curl show errors when they occur
|
# -S Show error. With -s, make curl show errors when they occur
|
||||||
# -L Follow redirects (H)
|
# -L Follow redirects (H)
|
||||||
# -o FILE Write to FILE instead of stdout
|
# -o FILE Write to FILE instead of stdout
|
||||||
# --retry 3 Retries transient errors 3 times (timeouts, 5xx)
|
# --retry 3 Retries transient errors 3 times (timeouts, 5xx)
|
||||||
if [[ "$(printf '%s\n' "7.71.0" "$CURL_VERSION" | sort -V | head -n1)" != "7.71.0" ]]; then
|
if [[ "$(printf '%s\n' "7.71.0" "$CURL_VERSION" | sort -V | head -n1)" != "7.71.0" ]]; then
|
||||||
# Curl version is less than or equal to 7.71.0, skipping retry-all-errors flag
|
# Curl version is less than or equal to 7.71.0, skipping retry-all-errors flag
|
||||||
curl -fkSL --retry 3 -o "$partial_target" "$download_source" 2>"${download_target}_download.log" || checkRC 'curl'
|
curl -fSL --retry 3 -o "$partial_target" "$download_source" 2>"${download_target}_download.log" || checkRC 'curl'
|
||||||
else
|
else
|
||||||
# Curl version is greater than 7.71.0, running curl with --retry-all-errors flag
|
# Curl version is greater than 7.71.0, running curl with --retry-all-errors flag
|
||||||
curl -fkSL --retry 3 --retry-all-errors -o "$partial_target" "$download_source" 2>"${download_target}_download.log" || checkRC 'curl'
|
curl -fSL --retry 3 --retry-all-errors -o "$partial_target" "$download_source" 2>"${download_target}_download.log" || checkRC 'curl'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Move the partial file to the download target.
|
# Move the partial file to the download target.
|
||||||
|
|||||||
Reference in New Issue
Block a user