From fb7b9a4b9e578fa8c9f5fb67e22daf4b0d22668e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Tue, 6 Feb 2024 14:22:36 +0100 Subject: [PATCH] Don't run vmr-scan.yml for PRs in ci.yml and treat main-ub as a main branch (#18515) --- src/SourceBuild/content/eng/pipelines/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/content/eng/pipelines/ci.yml b/src/SourceBuild/content/eng/pipelines/ci.yml index 11cb3b272dc4..3457a816b07b 100644 --- a/src/SourceBuild/content/eng/pipelines/ci.yml +++ b/src/SourceBuild/content/eng/pipelines/ci.yml @@ -30,7 +30,7 @@ variables: value: ${{ eq(variables['System.TeamProject'], 'internal') }} - name: isMainBranch - value: ${{ eq(variables['Build.SourceBranch'], 'refs/heads/main') }} + value: ${{ in(variables['Build.SourceBranch'], 'refs/heads/main', 'refs/heads/main-ub') }} - name: isScheduleTrigger value: ${{ eq(variables['Build.Reason'], 'Schedule') }} @@ -39,7 +39,8 @@ variables: value: ${{ eq(variables['Build.Reason'], 'PullRequest') }} stages: -- template: templates/stages/vmr-scan.yml +- ${{ if not(eq(variables.isPRTrigger, 'true')) }}: + - template: templates/stages/vmr-scan.yml - template: /src/installer/eng/pipelines/templates/stages/vmr-build.yml parameters: