smarkets / marge-bot

A merge-bot for GitLab
BSD 3-Clause "New" or "Revised" License
701 stars 136 forks source link

Fix guarantee final pipeline #351

Open qusielle opened 2 years ago

qusielle commented 2 years ago

Background: There are cases when a project needs to have a final run of the CI pipeline before the merge. For example, if a team practices fixup-driven code review process in a project, the fixup commits must be auto-squashed prior to a merge. This can be done in CI check by having a job that performs the check only when Marge-bot is assigned. Gitlab CI is not triggered automatically on actions like assigning, so that Marge-bot --guarantee-final-pipeline option is what is exactly needed in this case: it is supposed to trigger a pipeline right before the merge.

Problem and cause: --guarantee-final-pipeline does not trigger Gitlab CI at all. Only a comment jenkins retry appears in the review. Looking to the code, it is visible that no more than additional 30 seconds of waiting is implemented.

Measure:

felh commented 1 year ago

@qusielle @d3m3vilurr ping. This feature would be very interesting to us as well but my company only accepts tagged/released versions. Would be great to have this feature merged soon :)

qusielle commented 1 year ago

@qusielle @d3m3vilurr ping. This feature would be very interesting to us as well but my company only accepts tagged/released versions. Would be great to have this feature merged soon :)

Hello @felh, I would be happy to get this merged but I am afraid the repo is abandoned by its maintainers, as there are more people with active PRs and no response.

JohnVillalovos commented 1 year ago

@qusielle @d3m3vilurr ping. This feature would be very interesting to us as well but my company only accepts tagged/released versions. Would be great to have this feature merged soon :)

Hello @felh, I would be happy to get this merged but I am afraid the repo is abandoned by its maintainers, as there are more people with active PRs and no response.

There are a group of people who have recently forked the project at https://gitlab.com/marge-org/marge-bot

nejch commented 1 year ago

@qusielle @d3m3vilurr ping. This feature would be very interesting to us as well but my company only accepts tagged/released versions. Would be great to have this feature merged soon :)

Hello @felh, I would be happy to get this merged but I am afraid the repo is abandoned by its maintainers, as there are more people with active PRs and no response.

There are a group of people who have recently forked the project at https://gitlab.com/marge-org/marge-bot

Hey folks, as John said, this pull request has been imported into the community fork:

https://gitlab.com/marge-org/marge-bot/-/merge_requests/351

If you'd like to see it merged, please join over there. @qusielle do you have a GitLab.com account?

qusielle commented 1 year ago

Great to hear it was forked into something maintainable!

If you'd like to see it merged, please join over there. @qusielle do you have a GitLab.com account?

@nejch, yes, I do. It is the same name there. I will get into it a bit later this week.

d3m3vilurr commented 1 year ago

@qusielle @d3m3vilurr ping. This feature would be very interesting to us as well but my company only accepts tagged/released versions. Would be great to have this feature merged soon :)

Hello @felh, I would be happy to get this merged but I am afraid the repo is abandoned by its maintainers, as there are more people with active PRs and no response.

There are a group of people who have recently forked the project at https://gitlab.com/marge-org/marge-bot

Hey folks, as John said, this pull request has been imported into the community fork:

https://gitlab.com/marge-org/marge-bot/-/merge_requests/351

If you'd like to see it merged, please join over there. @qusielle do you have a GitLab.com account?

couple weeks ago, I also got a email from gitlab.org about import an issue. I'm glad to see a maintainable fork :)

now I've reopened a thread of my comment in gitlab, and copied thread comments of this to there.