From a06f8c30a49d9a4f02687261314b997cdc375169 Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Fri, 8 Nov 2019 13:57:25 -0800 Subject: [PATCH] Ensure we run PR, CI pipelines on release branches (#8471) --- build/ci/templates/steps/build.yml | 2 +- build/ci/templates/steps/build_compile.yml | 2 +- build/ci/vscode-python-ci.yaml | 2 +- build/ci/vscode-python-nightly-ci.yaml | 2 +- build/ci/vscode-python-nightly-flake-ci.yaml | 2 +- build/ci/vscode-python-nightly-uitest.yaml | 2 +- build/ci/vscode-python-pr-validation.yaml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/ci/templates/steps/build.yml b/build/ci/templates/steps/build.yml index fc953c7bfb60..9a308065640c 100644 --- a/build/ci/templates/steps/build.yml +++ b/build/ci/templates/steps/build.yml @@ -43,7 +43,7 @@ steps: - bash: | npm run updateBuildNumber -- --buildNumber $BUILD_BUILDID --updateChangelog displayName: "Update release Version of Extension" - condition: and(succeeded(), eq(variables['Build.SourceBranchName'], 'release')) + condition: and(succeeded(), startsWith(variables['Build.SourceBranchName'], 'release')) - bash: | npm run package diff --git a/build/ci/templates/steps/build_compile.yml b/build/ci/templates/steps/build_compile.yml index 5abf5c0bcdaa..badf6829d94d 100644 --- a/build/ci/templates/steps/build_compile.yml +++ b/build/ci/templates/steps/build_compile.yml @@ -48,7 +48,7 @@ steps: - bash: | npm run updateBuildNumber -- --buildNumber $BUILD_BUILDID --updateChangelog displayName: "Update release Version of Extension" - condition: and(succeeded(), eq(variables['build'], 'true'), eq(variables['Build.SourceBranchName'], 'release')) + condition: and(succeeded(), eq(variables['build'], 'true'), startsWith(variables['Build.SourceBranchName'], 'release')) - bash: | npm run package diff --git a/build/ci/vscode-python-ci.yaml b/build/ci/vscode-python-ci.yaml index 187f1f2a796a..29b22c7943e5 100644 --- a/build/ci/vscode-python-ci.yaml +++ b/build/ci/vscode-python-ci.yaml @@ -4,7 +4,7 @@ name: '$(Year:yyyy).$(Month).0.$(BuildID)-ci' # on changes in the news and .vscode folders. trigger: branches: - include: ["master", "release"] + include: ["master", "release*"] paths: exclude: ["/news/1 Enhancements", "/news/2 Fixes", "/news/3 Code Health", "/.vscode"] diff --git a/build/ci/vscode-python-nightly-ci.yaml b/build/ci/vscode-python-nightly-ci.yaml index a1752c80cfb0..a465421225bb 100644 --- a/build/ci/vscode-python-nightly-ci.yaml +++ b/build/ci/vscode-python-nightly-ci.yaml @@ -15,7 +15,7 @@ schedules: branches: include: - master - - release + - release* always: true # Variables that are available for the entire pipeline. diff --git a/build/ci/vscode-python-nightly-flake-ci.yaml b/build/ci/vscode-python-nightly-flake-ci.yaml index 62b42eb2f5ae..4702ca86217b 100644 --- a/build/ci/vscode-python-nightly-flake-ci.yaml +++ b/build/ci/vscode-python-nightly-flake-ci.yaml @@ -17,7 +17,7 @@ schedules: branches: include: - master - - release + - release* # False here so we don't run these long tests over and over on release branch if the source isn't changing always: false diff --git a/build/ci/vscode-python-nightly-uitest.yaml b/build/ci/vscode-python-nightly-uitest.yaml index c43ff39ce0cd..d3cac64c46f8 100644 --- a/build/ci/vscode-python-nightly-uitest.yaml +++ b/build/ci/vscode-python-nightly-uitest.yaml @@ -9,7 +9,7 @@ schedules: branches: include: - master - - releases/* + - releases* # Variables that are available for the entire pipeline. variables: diff --git a/build/ci/vscode-python-pr-validation.yaml b/build/ci/vscode-python-pr-validation.yaml index 593947f75746..2696ec8ef280 100644 --- a/build/ci/vscode-python-pr-validation.yaml +++ b/build/ci/vscode-python-pr-validation.yaml @@ -6,7 +6,7 @@ name: '$(Year:yyyy).$(Month).0.$(BuildID)-pr' pr: autoCancel: true branches: - include: ["master", "release"] + include: ["master", "release*"] paths: exclude: ["/news/1 Enhancements", "/news/2 Fixes", "/news/3 Code Health", "/.vscode"]