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

Added GitHub action to auto-merge #55

Merged
merged 4 commits into from
Oct 11, 2023
Merged

Conversation

Bullrich
Copy link
Contributor

@Bullrich Bullrich commented Oct 3, 2023

Added two GitHub actions to enable auto-merge in the repository.

This resolves #41

Auto-Merge-Bot

This bot allows public members of the organization and the author of the PR to enable/disable auto-merge in a PR. It also has a field for a list of users who are also allowed to trigger the bot. For that we have the second action.

Get Fellows Action

This action gets the fellows from the chain data and it extracts their GitHub handles. This handles are then input into the auto-merge-bot action as a list of users who are allowed to trigger the bot.


I have also updated the Pull Request template to mention the existence of this bot to new contributors.

Added two GitHub actions to enable auto-merge in the repository.

This resolves polkadot-fellows#41

## [Auto-Merge-Bot](https://github.com/paritytech/auto-merge-bot)

This bot allows _public_ members of the organization and the author of the PR to enable/disable auto-merge in a PR. It also has a field for a list of users who are also allowed to trigger the bot. For that we have the second action.
## [Get Fellows Action](https://github.com/paritytech/get-fellows-action)

This action gets the fellows from the chain data and it extracts their GitHub handles. This handles are then input into the `auto-merge-bot` action as a list of users who are allowed to trigger the bot.
I have also updated the Pull Request template to mention the existence of this bot to new contributors.
@Bullrich Bullrich mentioned this pull request Oct 3, 2023
@Bullrich Bullrich requested a review from bkontur October 3, 2023 13:56
@bkchr
Copy link
Contributor

bkchr commented Oct 3, 2023

@Bullrich could you please update the README to mention the bot.

Updated the readme to contain information about the bot, how to use it, and a link to its documentation

This will enable [`auto-merge`](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request) in the Pull Request (or merge it if it is ready to merge).

The automation can be triggered by the author of the PR or any fellow whose GitHub handle is part of their identity.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@bkchr I didn't go into detail on the identity because I assumed that #42 will fulfill the explanation of it.

Let me know if this is good for you.

Copy link
Contributor

@bkchr bkchr left a comment

Choose a reason for hiding this comment

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

Ty!

@bkchr bkchr merged commit ee6196c into polkadot-fellows:main Oct 11, 2023
5 of 9 checks passed
@Bullrich Bullrich deleted the auto-merge branch October 11, 2023 10:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Merge rights
6 participants