Skip to content

ci: add force merge automation#5612

Merged
mattdibi merged 4 commits intodevelopfrom
ci/force-merge-bot
Mar 19, 2025
Merged

ci: add force merge automation#5612
mattdibi merged 4 commits intodevelopfrom
ci/force-merge-bot

Conversation

@mattdibi
Copy link
Copy Markdown
Member

@mattdibi mattdibi commented Dec 9, 2024

This PR introduces a new Github workflows that allow to bypass the CI status checks via team member voting.

How it works

When a new comment is posted(or edited) in a PR, the workflow will:

  1. Check if the PR is yet to be merged and not in draft status
  2. Count how many comments containing the command /force-merge were posted. Only repo maintainer votes will be counted (this is not a democracy) and duplicates will be discarded.
  3. Set a label to the PR with the number of counted votes
  4. If enough votes are reached, the workflow will merge the PR bypassing the branch protection rules.

It uses the new PAT introduced in eclipse-kura/.eclipsefdn#24

Possible improvements

  • Instead of relying on the author_associtation to grant vote rights we can create a new organization team and have that only belonging to that team will grant you voting rights. This offers more granularity and flexibility at the expense of an additional REST API call and some more admin work.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Feb 8, 2025

This pull request is stale because it has been open for 60 days with no activity.

@github-actions github-actions Bot added the Stale label Feb 8, 2025
@MMaiero MMaiero removed the Stale label Feb 8, 2025
@mattdibi mattdibi force-pushed the ci/force-merge-bot branch from 566d23c to 322eb88 Compare March 17, 2025 09:01
@mattdibi mattdibi marked this pull request as ready for review March 19, 2025 10:13
@mattdibi mattdibi requested a review from MMaiero March 19, 2025 10:13
@mattdibi mattdibi merged commit 3bc78e3 into develop Mar 19, 2025
7 checks passed
@mattdibi mattdibi deleted the ci/force-merge-bot branch March 19, 2025 12:55
mattdibi added a commit that referenced this pull request Mar 19, 2025
salvatore-coppola pushed a commit that referenced this pull request Mar 25, 2025
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.

2 participants