From 0c44f80445a98e5c9c0f0da6909ccddf068ad5ea Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Mon, 25 Mar 2024 01:44:19 -0700 Subject: [PATCH] Stop syncing `main-ub` branch (#18564) --- eng/pipelines/templates/jobs/vmr-synchronization.yml | 8 ++------ eng/pipelines/vmr-sync.yml | 7 ------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/eng/pipelines/templates/jobs/vmr-synchronization.yml b/eng/pipelines/templates/jobs/vmr-synchronization.yml index 77efa3661..1c2cfcd11 100644 --- a/eng/pipelines/templates/jobs/vmr-synchronization.yml +++ b/eng/pipelines/templates/jobs/vmr-synchronization.yml @@ -2,10 +2,6 @@ ### It synchronizes the content of the VMR to this new commit and pushes the changes parameters: -- name: jobName - displayName: Name of the pipeline job - type: string - - name: targetRef displayName: Target revision of dotnet/installer to synchronize type: string @@ -22,7 +18,7 @@ parameters: default: false jobs: -- job: ${{ parameters.jobName }} +- job: Synchronize_VMR displayName: Synchronize VMR's ${{ parameters.vmrBranch }} timeoutInMinutes: 120 variables: @@ -70,7 +66,7 @@ jobs: - ${{ if and(not(parameters.noPush), not(in(variables['Build.Reason'], 'PullRequest')), eq(variables['System.TeamProject'], 'internal')) }}: # Push main and release branches to the public VMR - - ${{ if or(eq(parameters.vmrBranch, 'main'), eq(parameters.vmrBranch, 'main-ub'), startsWith(parameters.vmrBranch, 'release/')) }}: + - ${{ if or(eq(parameters.vmrBranch, 'main'), startsWith(parameters.vmrBranch, 'release/')) }}: - script: > ./.dotnet/dotnet darc vmr push --vmr '$(vmrPath)' diff --git a/eng/pipelines/vmr-sync.yml b/eng/pipelines/vmr-sync.yml index 955057122..6080023c4 100644 --- a/eng/pipelines/vmr-sync.yml +++ b/eng/pipelines/vmr-sync.yml @@ -36,11 +36,4 @@ variables: jobs: - template: /eng/pipelines/templates/jobs/vmr-synchronization.yml parameters: - jobName: Synchronize_VMR vmrBranch: ${{ variables.VmrBranch }} - -- ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/main') }}: - - template: /eng/pipelines/templates/jobs/vmr-synchronization.yml - parameters: - jobName: Synchronize_VMR_uncloaked - vmrBranch: ${{ variables.VmrBranch }}-ub