-
Notifications
You must be signed in to change notification settings - Fork 135
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
Re-approvals only applied after successful CI run #53
Comments
I'd quite like to submit a patch that does something along the lines of:
but I'm unsure as to whether or not that would be appropriate. |
Right now I can't see why resetting approvals immediately after push wouldn't be OK -- @jcpetruzza? If so I'm happy to move the steps around. Not sure about the |
I have a limited understanding of the code base. However, is it not the act of force pushing that is resetting approvals (it is in our case at least), therefore a successful push does not imply approvals haven't been reset. WRT the use of |
The approvals are reset on any push, assuming you have configured gitlab to do so (it's optional, but generally useful). Unfortunately gitlab is a bit dumb about resetting approvals and re-running CI: it should probably not do the former and defnitely not the latter if all that changed where merge commit comments. I'll probably push a fix later this evening (along the lines above). |
@aschmolck I assume that MR was supposed to close #56? |
@benjamb Indeed :| |
Rather than waiting for CI to pass, just approve right away; this is more convenient for transient errors such as flaky builds, and I see no obvious downside.
Rather than waiting for CI to pass, just approve right away; this is more convenient for transient errors such as flaky builds, and I see no obvious downside.
@aschmolck Thanks! |
There is a comment related to this within
marge/job.py
, including for context:Occasionally CI may fail due to transient network issues that are unrelated to the change made. In this case, Marge will error out and not bother attempting to reapply any approvals. GitLab doesn't remove approvals on CI failure, so it doesn't quite make sense that this happens with Marge.
This also applies to any potential exception that might occur between the force push and applying approvals, we need to restart marge and then manually approve again.
I'm unaware as to whether there is a historical reason for why approvals are reapplied when they are, but could they no be applied immediately after the rebase?
The text was updated successfully, but these errors were encountered: