diff --git a/.vsts-ci.yml b/.vsts-ci.yml index aee3999c0..ef2701cff 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -10,13 +10,6 @@ trigger: - internal/release/6.* - internal/release/7.* -resources: - repositories: - - repository: vmr - type: github - name: dotnet/dotnet - endpoint: dotnet - parameters: - name: vmrBranch displayName: dotnet/dotnet branch to push to @@ -379,17 +372,6 @@ stages: vmrBranch: ${{ variables.VmrBranch }} isBuiltFromVmr: false -# In case the VMR Build stage is temporarily disabled, the VMR synchronization step is run to validate -# that the PR can be merged and later synchronized into the VMR without problems. -- ${{ else }}: - - stage: Synchronize_VMR - displayName: Synchronize VMR - dependsOn: [] - jobs: - - template: eng/pipelines/templates/jobs/vmr-synchronization.yml - parameters: - vmrBranch: ${{ variables.VmrBranch }} - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - stage: Publish dependsOn: diff --git a/eng/pipelines/vmr-sync.yml b/eng/pipelines/vmr-sync.yml new file mode 100644 index 000000000..a637745ce --- /dev/null +++ b/eng/pipelines/vmr-sync.yml @@ -0,0 +1,38 @@ +trigger: + batch: true + branches: + include: + - main + - master + - release/* + +resources: + repositories: + - repository: vmr + type: github + name: dotnet/dotnet + endpoint: dotnet + +parameters: +- name: vmrBranch + displayName: dotnet/dotnet branch to push to + type: string + default: '' + +variables: + - ${{ if ne(parameters.vmrBranch, '') }}: + - name: VmrBranch + value: ${{ parameters.vmrBranch }} + - ${{ else }}: + - name: VmrBranch + value: ${{ replace(replace(variables['Build.SourceBranch'], 'refs/heads/', ''), 'refs/pull/', '') }} + +stages: +- stage: Synchronize_VMR + displayName: Synchronize VMR + dependsOn: [] + jobs: + - template: /eng/pipelines/templates/jobs/vmr-synchronization.yml + parameters: + vmrBranch: ${{ variables.VmrBranch }} + \ No newline at end of file