search

madjar / nox

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

Fix --no-merge #79

Closed matthewbauer closed 7 years ago

matthewbauer commented 7 years ago

GitHub’s api reports ‘base’ as master’s HEAD. We really just want the parent of the PR’s commits. This just requrests that directly from GitHub. If there’s a better way, I can’t find it. This should really fix my issues in Nixpkgs’ travis.

If this looks good to you, after merging, can you please do another release so we can try it in Nixpkgs HEAD.

matthewbauer commented 7 years ago

ping @madjar

madjar commented 7 years ago

Thanks, that should indeed some some problems. I'm trusting that you checked the orders of the returned commits to make sure we picked the older one.

madjar commented 7 years ago

Finished my PR merging spree :) Would you like to make sure things work as expected before I release? In the meantime, I'll set up automatic release with travis, because the current release process is annoying enough that I keep delaying.

matthewbauer commented 7 years ago

Ok. It's working as expected (no merge commit), now. Thanks!

madjar commented 7 years ago

It is now released, and here is the PR for nixpkgs: https://github.com/NixOS/nixpkgs/pull/29477