Skip to content
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

have a label tide/merge-method-squash in all PRs #33

Closed
wants to merge 1 commit into from

Conversation

sanposhiho
Copy link
Member

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

have a label tide/merge-method-squash in all PRs via PR template.
Instead of asking squash for authors, we can ask the bot to do squash merge.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

NONE

What are the benchmark results of this change?


@k8s-ci-robot k8s-ci-robot added kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jun 9, 2023
Copy link
Contributor

@codefromthecrypt codefromthecrypt left a comment

Choose a reason for hiding this comment

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

does this limit the message to only the title of PR? GitHub has this feature now, and it is a lot nicer that a list of "broke, fixed, fuzz" etc.

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: codefromthecrypt, sanposhiho

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@anuraaga
Copy link
Contributor

anuraaga commented Jun 9, 2023

If the bot is using the GitHub API it probably reflects the repo settings, so it may be good to confirm what they look like. The setting is around here
image

@sanposhiho
Copy link
Member Author

does this limit the message to only the title of PR? GitHub has this feature now, and it is a lot nicer that a list of "broke, fixed, fuzz" etc.

It also has the commits like f801a88

@sanposhiho
Copy link
Member Author

sanposhiho commented Jun 9, 2023

I just changed the setting to allow only squash merging, let's see how the bot works in another PR with this setting

Screenshot 2023-06-09 at 12 44 39

@codefromthecrypt
Copy link
Contributor

Screenshot 2023-06-09 at 11 53 59

maybe re-kick the action?

@sanposhiho
Copy link
Member Author

sanposhiho commented Jun 9, 2023

Well, seems we need to have the tide/merge-method-squash label anyway then to let the bot squash-merge the PR. 😓

@anuraaga
Copy link
Contributor

anuraaga commented Jun 9, 2023

@sanposhiho I'm not familiar with the bot but my guess would be you need to add /label tide/merge-method-squash to this PR itself to switch it to non-merge mode

@kerthcet
Copy link
Contributor

kerthcet commented Jun 9, 2023

My concern is independent commits will also be squashed. Prefer to label that manually.

@codefromthecrypt
Copy link
Contributor

My concern is independent commits will also be squashed. Prefer to label that manually.

if we do well one PR is small enough that independent commits aren't needed. how about it?

@sanposhiho
Copy link
Member Author

Have a chat with @codefromthecrypt, let's keep as it is now.
I'd close this.

/close

@k8s-ci-robot
Copy link
Contributor

@sanposhiho: Closed this PR.

In response to this:

Have a chat with @codefromthecrypt, let's keep as it is now.
I'd close this.

/close

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants