News for hackers. Stuff that matters.
Re:Successfully Merging the Work of 1000 Developers by username90 on Wednesday November 20, 2019 @11:36AM (#21585387)
> Trying to build CI on every branch before merging to master just won't work with the scale they are dealing with.

Google does it with 50 times the developer count.

> At 1000 developers, the rate of PRs coming in makes it impossible to determine what current master will be when the PR is ready to merge (i.e. when the branch has a green build).

True, it is impossible to catch all errors like this, but you can catch almost every error by building and testing it against current master and then merge it with the master 20 minutes later when the build is done. I have seen maybe one build breakage a year being introduced due to this in projects I've worked on, so it isn't a big deal.

Re:Successfully Merging the Work of 1000 Developers by iamweswilson on Wednesday November 20, 2019 @01:33PM (#21586862)
For even better accuracy you can use a tool that will run tests against speculative merge states. Zuul[1] is an open source project that supports it out of the box.

[1] https://zuul-ci.org/docs/zuul/user/gating.html

Re:Successfully Merging the Work of 1000 Developers by greiskul on Wednesday November 20, 2019 @12:03PM (#21585734)
> building and testing it against current master and then merge it with the master 20 minutes later when the build is done.

And I'm pretty sure that is the way Google does it too. Test a commit against current master, if tests are green commit. Then run tests against master again (and I think this stage might not run for every single commit) to see if anything broke on the rare times there was an actual conflict. If that run was red, which should be rare, then you can have the system do a bisect to find the offending commit, or just run all the ones that haven't been individually tested.

Re:Successfully Merging the Work of 1000 Developers by randomidiot666 on Wednesday November 20, 2019 @06:00PM (#21589561)
You have no idea how Google solved it. Basically everyone with a Monorepo (except Google) implements it as a cargo cult best practice. Mindlessly copying Google without understanding how Google actually does it.