NotificationsYou must be signed in to change notification settings
Fork321
Star786

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.

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

Already on GitHub?Sign in to your account

Jump to bottom

Merged

gcf-merge-on-green merged 5 commits intomainfromtswast-patch-1

Oct 12, 2021

Merged

chore: disable required linear history on v3 branch#1018

gcf-merge-on-green merged 5 commits intomainfromtswast-patch-1

Oct 12, 2021

Conversation

Copy link

Contributor

tswast commentedOct 12, 2021

This should prevent conflicts when we sync v3 with main.

Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly:

Make sure to open an issue as abug/issue before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea
Ensure the tests and linter pass
Code coverage does not decrease (if any source code was changed)
Appropriate docs were updated (if necessary)

chore: disable required linear history on v3 branch

68eee2b

This should prevent conflicts when we sync v3 with main.

tswast requested review froma team andbusunkim96

October 12, 2021 17:57

tswast requested a review froma team as acode owner

October 12, 2021 17:57

tswast requested a review fromshollyman

October 12, 2021 17:57

product-auto-labelbot added the api: bigqueryIssues related to the googleapis/python-bigquery API. label

Oct 12, 2021

google-clabot added the cla: yesThis human has signed the Contributor License Agreement. label

Oct 12, 2021

Copy link

ContributorAuthor

tswast commentedOct 12, 2021

Seems I got the schema wrong. I was guessing the property based on required_linear_history here:https://docs.github.com/en/rest/reference/repos#update-branch-protection

tswast added the do not mergeIndicates a pull request not ready for merge, due to either quality or timing. label

Oct 12, 2021

tswast mentioned this pull request

Oct 12, 2021

chore: sync v3 with main#1004

Merged

tseaver approved these changes

Oct 12, 2021

View reviewed changes

Copy link

Contributor

busunkim96 commentedOct 12, 2021

@tswast There's an example config with comments on all the possible options in the bot README:https://github.com/googleapis/repo-automation-bots/tree/main/packages/sync-repo-settings

https://github.com/googleapis/python-aiplatform/blob/5b1326f2516a0992afe3dab39789889bdbb12668/.github/sync-repo-settings.yaml#L3

mergeCommitAllowed: true should work.

tswast added4 commits

October 12, 2021 14:49

try per-branch merge commits

3b65194

remove unused requireLinearHistory

8abcbff

try requiresLinearHistory

a81d487

add merge commits back

6850c7f

Copy link

ContributorAuthor

tswast commentedOct 12, 2021

Hmmm... Looks like sync-repo-settings config doesn't allow a per-branch setting formergeCommitAllowed, but maybe I do still need to set it.

https://github.com/googleapis/repo-automation-bots/blob/9ca793a0420286600bb075e23430d594131ba34b/packages/sync-repo-settings/src/sync-repo-settings.ts#L277

requiresLinearHistory seems to be the right name. Not sure why it didn't match the spelling of the GitHub API.

https://github.com/googleapis/repo-automation-bots/blob/9ca793a0420286600bb075e23430d594131ba34b/packages/sync-repo-settings/src/sync-repo-settings.ts#L183

I think I need both.

tswast added automergeMerge the pull request once unit tests and other checks pass. and removed do not mergeIndicates a pull request not ready for merge, due to either quality or timing. labels

Oct 12, 2021

gcf-merge-on-greenbot merged commit5980920 intomain

Oct 12, 2021

gcf-merge-on-greenbot deleted the tswast-patch-1 branch

October 12, 2021 20:16

gcf-merge-on-greenbot removed the automergeMerge the pull request once unit tests and other checks pass. label

Oct 12, 2021

abdelmegahedgoogle pushed a commit to abdelmegahedgoogle/python-bigquery that referenced this pull request

Apr 17, 2023

chore: disable required linear history on v3 branch (googleapis#1018)

726eb24

This should prevent conflicts when we sync v3 with main.Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly:- [ ] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/python-bigquery/issues/new/choose) before writing your code!  That way we can discuss the change, evaluate designs, and agree on the general idea- [ ] Ensure the tests and linter pass- [ ] Code coverage does not decrease (if any source code was changed)- [ ] Appropriate docs were updated (if necessary)