Skip to content

chore: disable required linear history on v3 branch #1018

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
gcf-merge-on-green merged 5 commits into from
Oct 12, 2021
Merged

chore: disable required linear history on v3 branch #1018

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
68eee2b
chore: disable required linear history on v3 branch
tswast Oct 12, 2021
3b65194
try per-branch merge commits
tswast Oct 12, 2021
8abcbff
remove unused requireLinearHistory
tswast Oct 12, 2021
a81d487
try requiresLinearHistory
tswast Oct 12, 2021
6850c7f
add merge commits back
tswast Oct 12, 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
4 changes: 4 additions & 0 deletions .github/sync-repo-settings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
# https://github.com/googleapis/repo-automation-bots/tree/main/packages/sync-repo-settings
# Allow merge commits to sync main and v3 with fewer conflicts.
mergeCommitAllowed: true
# Rules for main branch protection
branchProtectionRules:
# Identifies the protection rule pattern. Name of the branch to be protected.
# Defaults to `main`
- pattern: main
requiresLinearHistory: true
requiresCodeOwnerReviews: true
requiresStrictStatusChecks: true
requiredStatusCheckContexts:
Expand All @@ -15,6 +18,7 @@ branchProtectionRules:
- 'Samples - Python 3.7'
- 'Samples - Python 3.8'
- pattern: v3
requiresLinearHistory: false
requiresCodeOwnerReviews: true
requiresStrictStatusChecks: true
requiredStatusCheckContexts:
Expand Down