From fce1e1b7876345acaddc8bd03e9ae06bc717967e Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Tue, 5 Oct 2021 15:59:33 +0000 Subject: [PATCH] Re-enable tarball PR validation --- .vsts-ci.yml | 9 ++++----- eng/Version.Details.xml | 4 ++-- .../templates/job/source-build-run-tarball-build.yml | 7 +++---- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 68b45b02a..5d0247741 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -353,11 +353,10 @@ stages: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml - # Disable until tarball build cleanly - # - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - # parameters: - # dependsOn: Source_Build_Create_Tarball - # condition: eq(dependencies.Source_Build_Create_Tarball.outputs['Tarball_Build_Check._includeTarballBuild'], 'true') + - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml + parameters: + dependsOn: Source_Build_Create_Tarball + condition: eq(dependencies.Source_Build_Create_Tarball.outputs['Tarball_Build_Check._includeTarballBuild'], 'true') # https://github.com/dotnet/core-sdk/issues/248 # - template: /eng/build.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bca46e7a2..ef8b3c77b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -207,9 +207,9 @@ https://github.com/dotnet/arcade c575da80f465e0b5fb98f416be92bb98b2f54b41 - + https://github.com/dotnet/source-build-reference-packages - f5558f1481f841e318e301d9cb7dd6f0fe4dd64e + 8468769b427d87f46501993de206bfb39265d432 diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index 2d9d06e6d..a6d2f8690 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -27,10 +27,9 @@ jobs: Fedora33-Online: _runOnline: true _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 - # Disable until prebuilts are eliminated - # Fedora33-Offline: - # _runOnline: false - # _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 + Fedora33-Offline: + _runOnline: false + _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2 timeoutInMinutes: 210 variables: _TarballDir: $(Build.StagingDirectory)/tarball