+
Skip to content

fix!: Differentiate merge method of pull request and merge queue #3559

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
merged 1 commit into from
Apr 23, 2025
Merged

fix!: Differentiate merge method of pull request and merge queue #3559

merged 1 commit into from
Apr 23, 2025

Conversation

stanfordpeng
Copy link
Contributor

@stanfordpeng stanfordpeng commented Apr 23, 2025 •
edited by gmlewis
Loading

BREAKING CHANGE: MergeMethod* consts have been split into: PullRequestMergeMethod* and MergeQueueMergeMethod*.

Fixes: #3558

This issue will cause GitHub API return error if user use type MergeMethod in MergeQueueRuleParameters.MergeMethod:

422 Invalid request. Invalid property /rules/0: data matches no possible input. See `documentation_url`. []

@google-cla Google CLA
Copy link

google-cla bot commented Apr 23, 2025

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@stanfordpeng stanfordpeng mentioned this pull request Apr 23, 2025
Closed
@gmlewis gmlewis changed the title differentiate merge method of pull request and merge queue Differentiate merge method of pull request and merge queue Apr 23, 2025
@codecov Codecov
Copy link

codecov bot commented Apr 23, 2025 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 91.24%. Comparing base (6a7684f) to head (357a569).
Report is 5 commits behind head on master.

Additional details and impacted files 
@@           Coverage Diff           @@
##           master    #3559   +/-   ##
=======================================
  Coverage   91.23%   91.24%           
=======================================
  Files         183      183           
  Lines       16053    16063   +10     
=======================================
+ Hits        14646    14656   +10     
  Misses       1231     1231           
  Partials      176      176

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@gmlewis gmlewis added Breaking API Change PR will require a bump to the major version num in next release. Look here to see the change(s). NeedsReview PR is awaiting a review before merging. labels Apr 23, 2025
@gmlewis gmlewis changed the title Differentiate merge method of pull request and merge queue fix!: Differentiate merge method of pull request and merge queue Apr 23, 2025
gmlewis
gmlewis approved these changes Apr 23, 2025
View reviewed changes
Copy link
Collaborator

@gmlewis gmlewis left a comment

Choose a reason for hiding this comment

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

Thank you, @stanfordpeng!
LGTM.

Awaiting second LGTM+Approval from any other contributor to this repo before merging.

@stevehipwell - might you be available for a code review? Thank you!

stevehipwell
stevehipwell approved these changes Apr 23, 2025
View reviewed changes
Copy link
Contributor

@stevehipwell stevehipwell left a comment

Choose a reason for hiding this comment

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

LGTM

@gmlewis
Copy link
Collaborator

gmlewis commented Apr 23, 2025

Thank you, @stevehipwell!
Merging.

@gmlewis gmlewis removed the NeedsReview PR is awaiting a review before merging. label Apr 23, 2025
@gmlewis gmlewis merged commit 04274a9 into google:master Apr 23, 2025
7 checks passed
@gmlewis gmlewis mentioned this pull request May 8, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stevehipwell stevehipwell stevehipwell approved these changes

@gmlewis gmlewis gmlewis approved these changes

Assignees
No one assigned
Labels
Breaking API Change PR will require a bump to the major version num in next release. Look here to see the change(s).
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

type MergeMethod only support lowercase which is conflicted with github API
3 participants
@stanfordpeng @gmlewis @stevehipwell
点击 这是indexloc提供的php浏览器服务，不要输入任何密码和下载