Skip to content

contrib/git: add merge drivers to automate post-merge commands #40189

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Jun 24, 2025
Merged

contrib/git: add merge drivers to automate post-merge commands #40189

merged 1 commit into from
Jun 24, 2025

Conversation

aanm
Copy link
Member

@aanm aanm commented Jun 24, 2025

Add merge driver configuration that automatically runs specific commands when certain files are merged. This automation helps maintain consistency by running essential tasks like go mod tidy, updating Kubernetes manifests, regenerating documentation, and fixing permissions after merge operations.

@aanm
contrib/git: add merge drivers to automate post-merge commands
e56e8de 
Add merge driver configuration that automatically runs specific commands when
certain files are merged. This automation helps maintain consistency by running
essential tasks like `go mod tidy`, updating Kubernetes manifests, regenerating
documentation, and fixing permissions after merge operations.

Signed-off-by: André Martins <andre@cilium.io>
@aanm aanm requested a review from a team as a code owner June 24, 2025 13:13
@aanm aanm added area/misc Impacts miscellaneous areas of the code not otherwise owned by another area. release-note/misc This PR makes changes that have no direct user impact. labels Jun 24, 2025
@aanm aanm requested a review from aditighag June 24, 2025 13:13
@aanm
Copy link
Member Author

aanm commented Jun 24, 2025

/test

@aanm aanm enabled auto-merge June 24, 2025 13:14
@aanm aanm added this pull request to the merge queue Jun 24, 2025
aditighag
aditighag approved these changes Jun 24, 2025
View reviewed changes
Copy link
Member

@aditighag aditighag left a comment

Choose a reason for hiding this comment

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

Thanks!

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jun 24, 2025
Merged via the queue into main with commit a1fe9e3 Jun 24, 2025
315 of 318 checks passed
@aanm aanm deleted the pr/add-post-merge-config branch June 24, 2025 15:30
@aanm aanm added needs-backport/1.15 needs-backport/1.16 This PR / issue needs backporting to the v1.16 branch needs-backport/1.17 This PR / issue needs backporting to the v1.17 branch labels Jun 30, 2025
@aanm
Copy link
Member Author

aanm commented Jun 30, 2025

We need to backport this to all branches because of .gitattributes changes.

@tklauser tklauser mentioned this pull request Jul 1, 2025
Merged
4 tasks
@tklauser tklauser added backport-pending/1.17 The backport for Cilium 1.17.x for this PR is in progress. and removed needs-backport/1.17 This PR / issue needs backporting to the v1.17 branch labels Jul 1, 2025
@tklauser tklauser mentioned this pull request Jul 1, 2025
Merged
1 task
@tklauser tklauser added backport-pending/1.16 The backport for Cilium 1.16.x for this PR is in progress. and removed needs-backport/1.16 This PR / issue needs backporting to the v1.16 branch labels Jul 1, 2025
@tklauser tklauser mentioned this pull request Jul 1, 2025
Merged
1 task
@tklauser tklauser added backport-pending/1.15 The backport for Cilium 1.15.x for this PR is in progress. and removed needs-backport/1.15 labels Jul 1, 2025
@github-actions github-actions bot added backport-done/1.15 The backport for Cilium 1.15.x for this PR is done. and removed backport-pending/1.15 The backport for Cilium 1.15.x for this PR is in progress. backport-pending/1.17 The backport for Cilium 1.17.x for this PR is in progress. labels Jul 1, 2025
@github-actions github-actions bot added backport-done/1.17 The backport for Cilium 1.17.x for this PR is done. backport-done/1.16 The backport for Cilium 1.16.x for this PR is done. and removed backport-pending/1.16 The backport for Cilium 1.16.x for this PR is in progress. labels Jul 1, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joestringer joestringer joestringer approved these changes

@aditighag aditighag aditighag approved these changes

Assignees
No one assigned
Labels
area/misc Impacts miscellaneous areas of the code not otherwise owned by another area. backport-done/1.15 The backport for Cilium 1.15.x for this PR is done. backport-done/1.16 The backport for Cilium 1.16.x for this PR is done. backport-done/1.17 The backport for Cilium 1.17.x for this PR is done. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@aanm @joestringer @aditighag @tklauser