Hi! > > > How about this strategy: instead of disabling or ignoring Merge > > > Requests on Salsa, take a peek at them at least once before uploading > > > I only see this working if either Salsa would have a (scriptable ?) upload > > button, or if the usual command-line tools like dput would have a config > > option > > to do so. For instance maybe dgit - which I am looking forward to test > > after > > my holidays - or gbp could prompt at an appropriate time "There are xyz MRs > > that can be merged in this branch with no conflict" ? > > Ah, that looks like a nice idea! So for people that use salsa MRs > and/or CI, I've implemented such an optional hook for dupload (which > complements other similar hooks such as its transitions, authorized > security or source-only uploads checks). > > The prospective implementation can be found at: > > > https://git.hadrons.org/cgit/debian/dpkg/dupload.git/commit/?h=pu/hook-salsa&id=313f515b57f6708881f2589a1e774d2ee1694305 > > Which I guess I'll be merging for the next upload. I've not added it > as a default hook because it would require for people to setup a salsa > token, and adds a significant amount of time for the checks. The salsa
Nice! I have devscripts installed and SALSA_TOKEN=xxxx in my ~/.devscripts so the above would work for me, but if the Salsa project is public (which all Debian packages should be), you can also check CI status without authentication. See related "git-debpush: check if CI passed before tagging" (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1111331). The check if CI passed or not is pretty clear. The check for Merge Requests is checking is MRs exist at all. On many projects it will list multiple MRs at any give time and perhaps not be very legible. It would be better if it listed only Merge Requests that have zero comments/reviews, as a sign of new MR that the maintainer didn't notice before and never looked at. Although not fool-proof, as the comment/review might have been from somebody else than the maintainer.
