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

Jump to bottom
Merged
gcf-merge-on-green merged 5 commits into from
Oct 12, 2021
Merged

chore: disable required linear history on v3 branch #1018

gcf-merge-on-green merged 5 commits into from
Oct 12, 2021

Conversation

@tswast
Copy link
Contributor

@tswast tswast commented Oct 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 a bug/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)

@tswast
chore: disable required linear history on v3 branch
68eee2b 
This should prevent conflicts when we sync v3 with main.
@tswast tswast requested review from a team and busunkim96 October 12, 2021 17:57
@tswast tswast requested a review from a team as a code owner October 12, 2021 17:57
@tswast tswast requested a review from shollyman October 12, 2021 17:57
@product-auto-label product-auto-label bot added the api: bigquery Issues related to the googleapis/python-bigquery API. label Oct 12, 2021
@google-cla google-cla bot added the cla: yes This human has signed the Contributor License Agreement. label Oct 12, 2021
@tswast
Copy link
Contributor Author

tswast commented Oct 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 tswast added the do not merge Indicates a pull request not ready for merge, due to either quality or timing. label Oct 12, 2021
@tswast tswast mentioned this pull request Oct 12, 2021
Merged
@busunkim96
Copy link
Contributor

busunkim96 commented Oct 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
Copy link
Contributor Author

tswast commented Oct 12, 2021

Hmmm... Looks like sync-repo-settings config doesn't allow a per-branch setting for mergeCommitAllowed, 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 tswast added automerge Merge the pull request once unit tests and other checks pass. and removed do not merge Indicates a pull request not ready for merge, due to either quality or timing. labels Oct 12, 2021
@gcf-merge-on-green gcf-merge-on-green bot merged commit 5980920 into main Oct 12, 2021
@gcf-merge-on-green gcf-merge-on-green bot deleted the tswast-patch-1 branch October 12, 2021 20:16
@gcf-merge-on-green gcf-merge-on-green bot removed the automerge Merge 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
@tswast @abdelmegahedgoogle
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)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@busunkim96 busunkim96 Awaiting requested review from busunkim96

@shollyman shollyman Awaiting requested review from shollyman

1 more reviewer

@tseaver tseaver tseaver approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

api: bigquery Issues related to the googleapis/python-bigquery API. cla: yes This human has signed the Contributor License Agreement.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@tswast @busunkim96 @tseaver