From 12c30eeb324e9ef755f2c4db1e014ebd6e45d09d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 13 Apr 2022 09:44:29 -0700 Subject: [PATCH 1/3] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220413.1 (#13623) Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 6.0.0-servicing.22208.1 -> To Version 6.0.0-servicing.22213.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 131a316f0..cf180107c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 1a6b24397e50146d0fece9cfb9c0b87275691e6f - + https://github.com/dotnet/source-build-reference-packages - e5429803f3e9064da8a857b561a07489800f3f29 + 60845bf36f0dd6dd310070548a58cb8ad3ab513c From 9563e594c5a7a945df14f775eda7680a5faaf8ec Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Wed, 13 Apr 2022 17:43:13 -0700 Subject: [PATCH 2/3] [release/6.0.1xx] Retry source-build artifacts download on failure (#13591) * retry source-built artifacts download with curl --- src/SourceBuild/tarball/content/prep.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/tarball/content/prep.sh b/src/SourceBuild/tarball/content/prep.sh index e3225d309..56e00219f 100755 --- a/src/SourceBuild/tarball/content/prep.sh +++ b/src/SourceBuild/tarball/content/prep.sh @@ -79,13 +79,13 @@ while read -r line; do if [[ $line == *"Private.SourceBuilt.Artifacts"* ]]; then if [ "$downloadArtifacts" == "true" ]; then echo " Downloading source-built artifacts from $line..." - (cd $SCRIPT_ROOT/packages/archive/ && curl -O $line) + (cd $SCRIPT_ROOT/packages/archive/ && curl --retry 5 -O $line) fi fi if [[ $line == *"Private.SourceBuilt.Prebuilts"* ]]; then if [ "$downloadPrebuilts" == "true" ]; then echo " Downloading source-built prebuilts from $line..." - (cd $SCRIPT_ROOT/packages/archive/ && curl -O $line) + (cd $SCRIPT_ROOT/packages/archive/ && curl --retry 5 -O $line) fi fi done < $SCRIPT_ROOT/packages/archive/archiveArtifacts.txt From 6ac60f74ebab454c7924eb1df20239d238a7f7cc Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Wed, 13 Apr 2022 23:55:34 -0700 Subject: [PATCH 3/3] Restore the version.details.xml file --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cf180107c..131a316f0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade 1a6b24397e50146d0fece9cfb9c0b87275691e6f - + https://github.com/dotnet/source-build-reference-packages - 60845bf36f0dd6dd310070548a58cb8ad3ab513c + e5429803f3e9064da8a857b561a07489800f3f29