Skip to content
This repository was archived by the owner on Mar 6, 2026. It is now read-only.

chore: disable required linear history on v3 branch - #1018

Merged
gcf-merge-on-green[bot] merged 5 commits into
mainfrom
tswast-patch-1
Oct 12, 2021
Merged

chore: disable required linear history on v3 branch#1018
gcf-merge-on-green[bot] merged 5 commits into
mainfrom
tswast-patch-1

Conversation

@tswast

Copy link
Copy Markdown
Contributor

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)

This should prevent conflicts when we sync v3 with main.
@tswast
tswast requested review from a team, busunkim96 and shollymanOctober 12, 2021 17:57
@product-auto-labelproduct-auto-labelBot added the api: bigquery Issues related to the googleapis/python-bigquery API. label Oct 12, 2021
@google-clagoogle-claBot added the cla: yes This human has signed the Contributor License Agreement. label Oct 12, 2021
@tswast

Copy link
Copy Markdown
ContributorAuthor

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

@tswasttswast added the do not merge Indicates a pull request not ready for merge, due to either quality or timing. label Oct 12, 2021
@tswasttswast mentioned this pull request Oct 12, 2021
@busunkim96

Copy link
Copy Markdown
Contributor

@tswast

Copy link
Copy Markdown
ContributorAuthor

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.

@tswasttswast 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-greenBot merged commit 5980920 into mainOct 12, 2021
@gcf-merge-on-green
gcf-merge-on-greenBot deleted the tswast-patch-1 branch October 12, 2021 20:16
@gcf-merge-on-greengcf-merge-on-greenBot 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
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 freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

api: bigqueryIssues related to the googleapis/python-bigquery API.cla: yesThis human has signed the Contributor License Agreement.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@tswast@busunkim96@tseaver