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

ci(Mergify): Add initial config #421

Merged
merged 1 commit into from
Feb 5, 2024

Conversation

Ryanf55
Copy link
Collaborator

@Ryanf55 Ryanf55 commented Feb 4, 2024

Purpose

Add a Mergify CI file to help grid_map maintainers out with automatic features such as backporting. This reduces the time per pull-request needed to maintain multiple branches. Easier review and backport helps promote smaller PR's that are easier to review or revert.

Details

  • For backport to iron and humble
  • Asking to fix conflicts
  • Deleting head branch after merge

Demo

  1. Ask for a backport: ci(Mergify): configuration update Ryanf55/grid_map#2 (comment)
  2. Mergify replies that it created the backport: ci(Mergify): configuration update Ryanf55/grid_map#2 (comment)
  3. You can see it automatically creates the backport: ci(Mergify): configuration update (backport #2) Ryanf55/grid_map#3

Future work

In the future, once we gain trust, I can add the automatic merge of backports as long as they pass CI. We should probably integrate an ABI checker to the repo before doing that. For now, reviewers will be required to do the final merge.

* For backport to iron and humble
* Asking to fix conflicts
* Deleting head branch after merge

Signed-off-by: Ryan <ryanfriedman5410+github@gmail.com>
@Ryanf55 Ryanf55 added the ros2 Affects ROS 2 label Feb 4, 2024
@Ryanf55 Ryanf55 added this to the 2.2.0 milestone Feb 4, 2024
@Ryanf55 Ryanf55 self-assigned this Feb 4, 2024
@Ryanf55 Ryanf55 added the ci Continuous Integration label Feb 4, 2024
@Ryanf55 Ryanf55 requested a review from wep21 February 5, 2024 14:23
Copy link
Collaborator

@wep21 wep21 left a comment

Choose a reason for hiding this comment

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

LGTM

@Ryanf55 Ryanf55 merged commit 7dc0a8c into ANYbotics:rolling Feb 5, 2024
@Ryanf55 Ryanf55 deleted the mergify/Ryanf55/config-update branch February 5, 2024 15:33
@Ryanf55
Copy link
Collaborator Author

Ryanf55 commented Feb 6, 2024

@Mergifyio backport humble
@Mergifyio backport iron

@Ryanf55
Copy link
Collaborator Author

Ryanf55 commented Feb 16, 2024

Looks like mergify works just fine without this backported.

Copy link

mergify bot commented Feb 16, 2024

backport humble

✅ Backports have been created

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci Continuous Integration ros2 Affects ROS 2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants