Support both master and main in Python (#18074)

Azure · Apr 16, 2021 · 46b402f · 46b402f
1 parent ebb02e3
commit 46b402f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 2 deletions.
diff --git a/eng/pipelines/aggregate-reports.yml b/eng/pipelines/aggregate-reports.yml
@@ -4,6 +4,7 @@ pr:
   branches:
     include:
       - master
+      - main
   paths:
     include:
       - eng/pipelines/aggregate-reports.yml

diff --git a/eng/pipelines/autorest_checks.yml b/eng/pipelines/autorest_checks.yml
@@ -5,6 +5,7 @@ pr:
   branches:
     include:
     - master
+    - main
     - feature/*
     - hotfix/*
     - release/*

diff --git a/eng/pipelines/templates/jobs/tests-nightly-python.yml b/eng/pipelines/templates/jobs/tests-nightly-python.yml
@@ -1,5 +1,6 @@
 trigger:
   - master
+  - main
 
 jobs:
 

diff --git a/eng/pipelines/templates/jobs/update_pr.yml b/eng/pipelines/templates/jobs/update_pr.yml
@@ -5,6 +5,7 @@
 
 trigger:
 - master
+- main
 
 variables:
   skipComponentGovernanceDetection: true

diff --git a/eng/pipelines/templates/steps/build-artifacts.yml b/eng/pipelines/templates/steps/build-artifacts.yml
@@ -24,11 +24,11 @@ steps:
       PackageName: "azure-template"
       ServiceDirectory: "template"
       TestPipeline: ${{ parameters.TestPipeline }}
-
+  - template: /eng/common/pipelines/templates/steps/set-default-branch.yml
   - script: |
       echo "##vso[build.addbuildtag]Scheduled"
     displayName: 'Tag scheduled builds'
-    condition: and(eq(variables['Build.SourceBranchName'],'master'),eq(variables['Build.Reason'],'Schedule'))
+    condition: and(eq(variables['Build.SourceBranchName'], variables['DefaultBranch']), eq(variables['Build.Reason'],'Schedule'))
 
   - task: UsePythonVersion@0
     displayName: 'Use Python 2.7'
-Original file line number
+Diff line change
@@ -1,5 +1,6 @@
     trigger:
       - master
+      - main
     jobs:
@@ Expand Down @@