diff options
author | dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> | 2020-12-07 16:26:41 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-07 16:26:41 +0300 |
commit | 55480715b168f440e939928cd3f65eab21475eca (patch) | |
tree | 13bde301c66a2b787781a2971fdd4a2e8a3c7520 /eng/common | |
parent | b24d0e663d5bf4772b0896e2bc3dab3391fae744 (diff) |
Update dependencies from https://github.com/dotnet/arcade build 20201201.2 (#1671)
[master] Update dependencies from dotnet/arcade
Diffstat (limited to 'eng/common')
-rwxr-xr-x | eng/common/tools.sh | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 98186e784..871527241 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -249,7 +249,7 @@ function with_retries { return 0 fi - timeout=$((2**$retries-1)) + timeout=$((3**$retries-1)) echo "Failed to execute '$@'. Waiting $timeout seconds before next attempt ($retries out of $maxRetries)." 1>&2 sleep $timeout done @@ -271,10 +271,14 @@ function GetDotNetInstallScript { # Use curl if available, otherwise use wget if command -v curl > /dev/null; then - with_retries curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" || { - local exit_code=$? - Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')." - ExitWithExitCode $exit_code + # first, try directly, if this fails we will retry with verbose logging + curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" || { + echo "curl failed; will now retry with verbose logging." + with_retries curl "$install_script_url" -sSL --verbose --retry 10 --create-dirs -o "$install_script" || { + local exit_code=$? + Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')." + ExitWithExitCode $exit_code + } } else with_retries wget -v -O "$install_script" "$install_script_url" || { |