tasks/evaluate: error on PRs targeting nixos-* or nixpkgs-* branches#546
tasks/evaluate: error on PRs targeting nixos-* or nixpkgs-* branches#546cole-h merged 1 commit intoNixOS:releasedfrom
Conversation
LnL7
left a comment
There was a problem hiding this comment.
Hmm, I seem to remember that merging to channel branches didn't work. Did something change or is this perhaps something explicit per branch that wasn't updated with 20.09?
8e95a43 to
080e3e7
Compare
|
Don't mean to shame anyone, but the person who merged the PR to nixos-20.09 was an Owner in the org (and thus was able to bypass the protected branch restriction). It's easy to overlook, so I think it makes sense to raise an alarm, especially for cases like these. |
|
Ah that explains it. Either way this is an extra place to catch it and it's something it gives feedback to the contributor. Perhaps the message could even be improved to give a bit more detail on what's going on with some of the information from eg. https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#backporting-changes. Currently it's up to the reviewer to explain https://github.com/NixOS/nixpkgs/pulls?q=base%3Anixos-20.0 |
A PR's target branch is easy to overlook. ofborg should complain loudly if a nixos-* or nixpkgs-* branch is the target of a PR.
080e3e7 to
2b00a0d
Compare
|
Even if NixOS/nixpkgs#109543 is accepted and merged, I'd also like to have a check in ofborg itself. |
A PR's target branch is easy to overlook. ofborg should complain loudly
if a nixos-* or nixpkgs-* branch is the target of a PR.
NixOS/nixpkgs#109384, https://logs.nix.samueldr.com/nixos/2021-01-14#4470635
Happy to bikeshed on the actual message, but I think this is the right thing to do (and probably should have been done long ago).
EDIT: pedantry fixed here: #547