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

replace backport github action with mergify #11321

Merged
merged 1 commit into from
Aug 26, 2024

Conversation

Mic92
Copy link
Member

@Mic92 Mic92 commented Aug 17, 2024

The current backport action cannot automerge because the github action bot does not trigger github CI actions. Mergify instead does not have this limitation and can also use a merge queue.

On top we have now a declarative configuration to allow contributers to mark new tests as required without having access to the github org.

An example pull request and backport can be seen here:

Mic92#4

and here:

Mic92#5

To complete the setup the mergify app must be enabled for this repository. It's already installed in the nixos organization for nixos-hardware and other repositories. Just go to
the settings for this repository and click on "GitHub Apps"

Motivation

Context

Priorities and Process

Add 👍 to pull requests you find important.

The Nix maintainer team uses a GitHub project board to schedule and track reviews.

The current backport action cannot automerge because
the github action bot does not trigger github CI actions.
Mergify instead does not have this limitation and can also
use a merge queue.

On top we have now a declarative configuration to allow
contributers to add new tests to required without having access
to the github org.

An example pull request and backport can be seen here:

#4

and here:

#5

To complete the setup the mergify app must be enabled for this repository.
It's already installed in the nixos organization for nixos-hardware and
other repositories.
@Mic92 Mic92 requested a review from edolstra as a code owner August 17, 2024 07:22
@Mic92 Mic92 requested a review from tomberek August 17, 2024 07:22
actions:
backport:
branches:
- 2.18-maintenance
Copy link
Member Author

@Mic92 Mic92 Aug 17, 2024

Choose a reason for hiding this comment

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

If you find these rules too tedious, one can also have a label for multiple nix branches.

@Mic92
Copy link
Member Author

Mic92 commented Aug 17, 2024

Check out all the other nice additions of mergify that can be run by using @mergify + command

I like rebase: https://docs.mergify.com/workflow/actions/rebase/
and squash: https://docs.mergify.com/workflow/actions/squash/

@tomberek
Copy link
Contributor

Reported to have the app approved. Merging.

@tomberek tomberek merged commit 7b53636 into NixOS:master Aug 26, 2024
12 checks passed
@Mic92 Mic92 deleted the mergify-automerge branch August 26, 2024 14:08
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/2024-08-26-nix-team-meeting-minutes-172/51300/1

@roberth roberth added the backport 2.24-maintenance Automatically creates a PR against the branch label Sep 9, 2024
@roberth roberth added backport 2.18-maintenance Automatically creates a PR against the branch backport 2.19-maintenance Automatically creates a PR against the branch backport 2.20-maintenance Automatically creates a PR against the branch backport 2.21-maintenance Automatically creates a PR against the branch backport 2.22-maintenance Automatically creates a PR against the branch backport 2.23-maintenance Automatically creates a PR against the branch labels Sep 9, 2024
roberth added a commit that referenced this pull request Sep 16, 2024
…1321

replace backport github action with mergify (backport #11321)
roberth added a commit that referenced this pull request Sep 16, 2024
…1321

replace backport github action with mergify (backport #11321)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.18-maintenance Automatically creates a PR against the branch backport 2.19-maintenance Automatically creates a PR against the branch backport 2.20-maintenance Automatically creates a PR against the branch backport 2.21-maintenance Automatically creates a PR against the branch backport 2.22-maintenance Automatically creates a PR against the branch backport 2.23-maintenance Automatically creates a PR against the branch backport 2.24-maintenance Automatically creates a PR against the branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants