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

Enable auto merge using Mergify on approval #148

Merged
merged 2 commits into from
Jun 4, 2020
Merged

Enable auto merge using Mergify on approval #148

merged 2 commits into from
Jun 4, 2020

Conversation

gauravgahlot
Copy link
Contributor

Enable auto-merge using Mergify on approval.

Workflow:

  • Developer opens a PR
  • Reviewer approves the changes and adds ready-to-merge label
  • Mergify runs CI again and merges the PR
  • Mergify holds the auto-merge if hold-off-merging label is set

Signed-off-by: Gaurav Gahlot gaurav.gahlot19@gmail.com

@gauravgahlot gauravgahlot added the kind/feature Categorizes issue or PR as related to a new feature. label Jun 4, 2020
@gauravgahlot gauravgahlot requested a review from grahamc June 4, 2020 13:54
@gauravgahlot gauravgahlot self-assigned this Jun 4, 2020
Signed-off-by: Gaurav Gahlot <gaurav.gahlot19@gmail.com>
grahamc
grahamc previously approved these changes Jun 4, 2020
Copy link
Contributor

@grahamc grahamc left a comment

Choose a reason for hiding this comment

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

I think we probably want these two minor changes to behavior. Note if rebase fails, it'll fall back to merge -- which I think is okay.

.mergify.yml Outdated
- status-success=CI / build
actions:
merge:
method: squash
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we probably want to use the rebase method, which should automatically fall back to merge if rebase fails.

Suggested change
method: squash
method: rebase

.mergify.yml Outdated
merge:
method: squash
commit_message: title+body
strict: smart
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
strict: smart
strict: smart+fastpath

Signed-off-by: Gaurav Gahlot <gaurav.gahlot19@gmail.com>
@grahamc grahamc merged commit 28fe0aa into tinkerbell:master Jun 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/feature Categorizes issue or PR as related to a new feature.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants