How to merge your patch

[Matthew Pickering]

Latest update. I had to deploy her again because the CI timeout was
set too low (10h). The timeout is now 24 hours.

Sorry for the noisy emails this is generating. Fingers crossed for this time.

Cheers,

Matt

On Thu, Feb 7, 2019 at 4:10 PM Ben Gamari <ben at well-typed.com> wrote:
>
> Simon Peyton Jones via ghc-devs <ghc-devs at haskell.org> writes:
>
> > |   2. assign the merge request to @marge-bot using the assignee field in
> > |      the right-hand sidebar of the merge request page.
> >
> > This sounds great. What email will we receive in these three cases?
> >
> When Marge picks up an MR and incorporates it into a batch merge she
> leaves a message [1] of the form
>
> >>> I will attempt to batch this MR (!303 (closed))...
>
> [1] https://gitlab.haskell.org/ghc/ghc/merge_requests/58#note_5354
>
>
>
> > a) the merge is successful
>
> At this point Marge will close the MR and leave a note [2] of the form
>
> >>> @marge-bot merged 9 hours ago
>
> [2] https://gitlab.haskell.org/ghc/ghc/merge_requests/58#note_5385
>
>
>
> > b) the merge fails because I made a mistake and it just doesn't
> > validate
>
> Unfortunately I've not seen a case where this has happened since we
> enabled batching so I can't comment yet.
>
> However, from previous experience I suspect the message will look
> something like this [3]
>
> >>> I couldn't merge this branch: CI failed!
>
> [3] https://gitlab.haskell.org/ghc/ghc/merge_requests/257#note_4788
>
>
>
> > c) the merge failed because the CI infrastructure failed somehow
> >    (should no longer happen, I know).
>
> From Marge's perspective this typically looks no different from (b). In
> the past the infrastructure issues fell into a few buckets:
>
>  * the Windows or Darwin builders ran out of disk space due to [4],
>    resulting in spurious failures
>
>  * some fragile test failed
>
>
> Cheers,
>
> - Ben
>
>
> [4] https://gitlab.com/gitlab-org/gitlab-runner/issues/3856#note_127887227
> _______________________________________________
> ghc-devs mailing list
> ghc-devs at haskell.org
> http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs