Skip to content

Support both master and main in Python #18074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sima-zhu merged 4 commits into from
Apr 16, 2021
Merged

Support both master and main in Python #18074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
163f4ef
Use default branch and add main into default branch
sima-zhu Apr 14, 2021
98af37f
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-pytho…
sima-zhu Apr 14, 2021
c022748
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-pytho…
sima-zhu Apr 15, 2021
c301c70
Use the right way of reading the default branch.
sima-zhu Apr 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions eng/pipelines/aggregate-reports.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ pr:
branches:
include:
- master
- main
paths:
include:
- eng/pipelines/aggregate-reports.yml
Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/autorest_checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ pr:
branches:
include:
- master
- main
- feature/*
- hotfix/*
- release/*
Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/templates/jobs/tests-nightly-python.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
trigger:
- master
- main

jobs:

Expand Down
1 change: 1 addition & 0 deletions eng/pipelines/templates/jobs/update_pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

trigger:
- master
- main

variables:
skipComponentGovernanceDetection: true
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/templates/steps/build-artifacts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'))
Copy link
Contributor Author

@sima-zhu sima-zhu Apr 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

Tested in core pipeline: https://dev.azure.com/azure-sdk/public/_build/results?buildId=845791&view=logs&j=3dc8fd7e-4368-5a92-293e-d53cefc8c4b3&t=3c663f50-2031-5e5a-5a27-a536dda269a8


- task: UsePythonVersion@0
displayName: 'Use Python 2.7'
Expand Down