From 688c0c534f40d826271774001adc7d047010fc70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emek=20Vysok=C3=BD?= Date: Thu, 22 Dec 2022 13:22:57 +0100 Subject: [PATCH] Re-enable VMR build in installer's PRs (#15170) --- .vsts-ci.yml | 11 +++++------ src/SourceBuild/content/build.sh | 0 .../content/eng/install-nuget-credprovider.sh | 0 src/SourceBuild/content/prep.sh | 0 src/SourceBuild/content/prereqs/packages/archive/_ | 0 src/SourceBuild/content/prereqs/packages/prebuilt/_ | 0 6 files changed, 5 insertions(+), 6 deletions(-) mode change 100644 => 100755 src/SourceBuild/content/build.sh mode change 100644 => 100755 src/SourceBuild/content/eng/install-nuget-credprovider.sh mode change 100644 => 100755 src/SourceBuild/content/prep.sh create mode 100644 src/SourceBuild/content/prereqs/packages/archive/_ create mode 100644 src/SourceBuild/content/prereqs/packages/prebuilt/_ diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 89b59ca95..59526b0ca 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -373,12 +373,11 @@ stages: # the VMR synchronization step is run to validate that the PR can be merged and later # synchronized into the VMR without problems. # You can do this by allowing the Synchronize_VMR stage from above in PRs. -# TODO - Temporarily disabled (https://github.com/dotnet/source-build/issues/3184) -# - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: -# - template: eng/pipelines/templates/stages/vmr-build.yml -# parameters: -# vmrBranch: ${{ parameters.vmrBranch }} -# isBuiltFromVmr: false +- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: + - template: eng/pipelines/templates/stages/vmr-build.yml + parameters: + vmrBranch: ${{ parameters.vmrBranch }} + isBuiltFromVmr: false - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - stage: Publish diff --git a/src/SourceBuild/content/build.sh b/src/SourceBuild/content/build.sh old mode 100644 new mode 100755 diff --git a/src/SourceBuild/content/eng/install-nuget-credprovider.sh b/src/SourceBuild/content/eng/install-nuget-credprovider.sh old mode 100644 new mode 100755 diff --git a/src/SourceBuild/content/prep.sh b/src/SourceBuild/content/prep.sh old mode 100644 new mode 100755 diff --git a/src/SourceBuild/content/prereqs/packages/archive/_ b/src/SourceBuild/content/prereqs/packages/archive/_ new file mode 100644 index 000000000..e69de29bb diff --git a/src/SourceBuild/content/prereqs/packages/prebuilt/_ b/src/SourceBuild/content/prereqs/packages/prebuilt/_ new file mode 100644 index 000000000..e69de29bb