On Sun, Apr 20, 2025 at 7:21 AM Ingo Klöcker <kloec...@kde.org> wrote:
> On Samstag, 19. April 2025 10:33:45 Mitteleuropäische Sommerzeit Ben > Cooksley > wrote: > > A big part of the issue here is our rebase centric workflow - normally > with > > Gitlab you use merge commits and in this workflow CI only runs when the > MR > > changes. > > With a rebase workflow like ours though, other changes to the repo > require > > the merge request to be updated - triggering unnecessary CI runs. > > Sounds like we shouldn't be so trigger-happy clicking the Rebase button on > our > MRs when it's not really necessary. We could rebase locally and then > commit > the rebase together with other review changes. > If you don't rebase on Gitlab then it won't detect that a merge request has been merged when you push the changes so probably not the best to do it that way. > > On the other hand, GitLab doesn't really make it easy to avoid running > pipelines unnecessarily often because "Apply Suggestion" will trigger a > pipeline even if other review comments require local changes. So, either > we > have to cancel the pipeline that GitLab started automatically if we need > to > make more changes. Or we have to refrain from using "Apply Suggestion" and > instead apply the suggestions manually locally. Neither approach is > convenient. > Apply suggestion should allow batching - see https://docs.gitlab.com/user/project/merge_requests/reviews/suggestions/#batch-suggestions > > Regards, > Ingo Cheers, Ben
