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

Configure the merge queue via a ruleset #242

Merged
merged 2 commits into from
Apr 17, 2024

Conversation

llucax
Copy link
Contributor

@llucax llucax commented Apr 16, 2024

No description provided.

@llucax llucax requested a review from a team as a code owner April 16, 2024 13:46
@leandro-lucarella-frequenz leandro-lucarella-frequenz added this to the v0.10.0 milestone Apr 16, 2024
@github-actions github-actions bot added part:cookiecutter Affects the generation of projects using cookiecutter part:doc labels Apr 16, 2024
@llucax llucax enabled auto-merge April 16, 2024 13:47
@llucax llucax force-pushed the merge-queue-rule branch from dcd6e64 to d629c97 Compare April 16, 2024 13:48
@llucax llucax requested a review from Marenz April 16, 2024 14:29
Marenz
Marenz previously approved these changes Apr 16, 2024
@llucax llucax added this pull request to the merge queue Apr 16, 2024
@llucax llucax removed this pull request from the merge queue due to a manual request Apr 16, 2024
@llucax llucax added this pull request to the merge queue Apr 16, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to a conflict with the base branch Apr 16, 2024
llucax added 2 commits April 17, 2024 09:06
Signed-off-by: Leandro Lucarella <[email protected]>
Rulesets can now be used to configure merge queues, so we can finally
drop branch protection rules completely.

Signed-off-by: Leandro Lucarella <[email protected]>
@llucax
Copy link
Contributor Author

llucax commented Apr 17, 2024

Rebased and resolved conflicts.

@llucax
Copy link
Contributor Author

llucax commented Apr 17, 2024

Enabled auto-merge too.

@llucax llucax enabled auto-merge April 17, 2024 12:08
@llucax llucax requested a review from Marenz April 17, 2024 12:08
@llucax
Copy link
Contributor Author

llucax commented Apr 17, 2024

Will self-merge as this was approved and didn't have any changes, just resolving conflicts.

@llucax llucax disabled auto-merge April 17, 2024 12:47
@llucax llucax merged commit 7038297 into frequenz-floss:v0.x.x Apr 17, 2024
14 checks passed
@leandro-lucarella-frequenz leandro-lucarella-frequenz deleted the merge-queue-rule branch April 30, 2024 13:09
@llucax llucax added part:docs Affects the documentation and removed part:doc labels May 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
part:cookiecutter Affects the generation of projects using cookiecutter part:docs Affects the documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants