[GHC DevOps Group] CircleCI job accounting question

[Manuel M T Chakravarty]

> Am 16.12.2017 um 04:06 schrieb Simon Marlow <marlowsd at gmail.com>:
> 
> On 14 December 2017 at 17:30, Ben Gamari <ben at well-typed.com <mailto:ben at well-typed.com>> wrote:
> Historically GHC avoided this since GHC avoided merge commits as they
> complicate bisection. However, now since GitHub supports rebase-merging
> this is certainly a compelling option. It's certainly much simpler than
> the approach I outlined above yet provides the same benefits.
> 
> If no one objects I think this sounds like a great path forward.
> 
> We’ll have to be careful to tell people that PRs will be squashed when merging, since the current workflow is to push multiple patches at once to master.

Yes, good point.

> How does merging PRs work when our source of truth is not on github?

I am not sure, but there are merged PR’s in the GitHub history, so I assume, it works. Ben?

Incidentally, once we have no more direct pushes to master, would it make sense to make GitHub the source of truth? (That would get rid of another bit of custom infrastructure.)

Cheers,
Manuel

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-devops-group/attachments/20171218/e4adf37e/attachment.html>