Skip to content

set default branch as main for pipeline #15465

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
akning-ms merged 2 commits into from
Aug 2, 2021
Merged

set default branch as main for pipeline #15465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77626df
set default branch as main
zhenglaizhang Aug 2, 2021
3d93a7c
block pr to public spec repo
zhenglaizhang Aug 2, 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
2 changes: 1 addition & 1 deletion .azure-pipelines/BranchProtectionForPrivateRepo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ jobs:
- job: "BranchProtectionForPrivateRepo"
pool:
vmImage: 'Ubuntu 16.04'
condition: and(variables['PRIVATE'], eq(variables['System.PullRequest.TargetBranch'], 'master'))
condition: and(variables['PRIVATE'], eq(variables['System.PullRequest.TargetBranch'], 'main'))
Copy link
Copy Markdown
Contributor

@akning-ms akning-ms Aug 2, 2021

Choose a reason for hiding this comment

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

should protect both main & master initially?

Copy link
Copy Markdown
Contributor Author

@zhenglaizhang zhenglaizhang Aug 2, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

This is for block private spec repo merge to main branch.
I am testing another task for blocking sending PR to master branch, this new task will be removed after the transition period.

Copy link
Copy Markdown
Contributor Author

@zhenglaizhang zhenglaizhang Aug 2, 2021

Choose a reason for hiding this comment

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

already added check , after renaming, we can merge the PR and mark the check public.rest-api-specs (ShouldSendPRToMain) as required, e.g. https://github.com/Azure/azure-rest-api-specs/pull/15465/checks?check_run_id=3216862934

steps:
- script: '>&2 echo "the branch is protected"'
failOnStderr: true
8 changes: 8 additions & 0 deletions .azure-pipelines/ShouldSendPRToMain.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
jobs:
- job: "ShouldSendPRToMain"
pool:
vmImage: 'Ubuntu 16.04'
condition: eq(variables['System.PullRequest.TargetBranch'], 'master')
steps:
- script: '>&2 echo "##vso[task.logissue type=error]Please edit the pull request to targeting new default branch main"'
failOnStderr: true
3 changes: 2 additions & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@ variables:
PR_ONLY: 'true'

jobs:
- template: .azure-pipelines/BranchProtectionForPrivateRepo.yml
- template: .azure-pipelines/BranchProtectionForPrivateRepo.yml
- template: .azure-pipelines/ShouldSendPRToMain.yml