search

madjar / nox

Tools to make nix nicer to use
MIT License
308 stars 35 forks source link

Add option to not auto-merge pr into base. #66

Closed matthewbauer closed 7 years ago

matthewbauer commented 7 years ago

This is part of my effort to make travis testing in NixOS/nixpkgs more predictable. Basically, when we have a PR, the base branch is almost always going to be "nixpkgs/master" but most likely, binary caches are not going to be available for it. So, during a mass rebuild, all of the Travis builds will time out.

To combat this, this option --no-merge will keep the pr branch intact. No merging is done so if the developer bases off of nixpkgs-channels/master they can benefit from having the binary cache available to them (unless of course their diffs cause its own mass rebuild). Ideally, I think this can be made default, but I'm going to leave it as an option for now to remain backwards compatible.

See #65

madjar commented 7 years ago

I agree with you. It's nice to make sure the PR still works when it is merged with master, but it's not worth the failures we get when master is hard to build. And it's definitely not worth the pain of trying to do a proper merge when travis only has a limited history.

I'm merging this. One further improvement might be to merge it nixpkgs-channels/master to get both fast builds and some garantee that the PR still merges gracefully into master.