Skip to content

rulesets/nixpkgs: remove exception for force push for release team #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

wolfgangwalther
Copy link
Contributor

@wolfgangwalther wolfgangwalther commented Jun 19, 2025

We currently have two exceptions for the @NixOS/nixos-release-managers team in the Nixpkgs branch protection rules:

  • They can force push to staging branches.
  • They can push to release branches without Pull Requests. (valid use-case)

AFAICT, neither is required for the release process documented at https://nixos.github.io/release-wiki/Branch-Off.html. Those exceptions are most likely caused by the old branch protection rules, which were not as flexible as the new rulesets.

Note: Branch creation does not require "pushing to release branches". This only applies after the branch is created and more commits should be pushed to it. I just confirmed that in my fork to be sure.

@wolfgangwalther wolfgangwalther requested a review from a team as a code owner June 19, 2025 15:33
… team

Nothing in the release process documentation hints at a requirement to
force push the staging branches. They should never be.

https://nixos.github.io/release-wiki/Branch-Off.html
@wolfgangwalther wolfgangwalther force-pushed the rulesets-nixpkgs-no-force-pushes branch from c49875f to ba75447 Compare June 19, 2025 15:49
@wolfgangwalther wolfgangwalther changed the title nixpkgs branch protection rules: remove exceptions for release team rulesets/nixpkgs: remove exceptions for release team Jun 19, 2025
@leona-ya
Copy link
Member

This is not correct with how we did the last release:

  1. At branch-off, the beta commit is currently pushed directly. Here I don't have much problem with changing that tho
  2. https://nixos.github.io/release-wiki/Final-Release.html#at-final-release-time: The final release commit is currently pushed to the protected branch. We might be able to do that with a PR, but for me it seems cursed to tag a merge commit as "the release commit" or a commit that was merged with a merge commit as this might has a non-consistent state.

I'm happy to discuss whether my option here is strange, but I think we should do that and not remove rights before that.

@wolfgangwalther
Copy link
Contributor Author

Ah, I didn't read through the Final Release part. That's the reason for that exception, no problem with that. I'll happily drop this commit and leave it at the removal of the force push exception.

@wolfgangwalther wolfgangwalther force-pushed the rulesets-nixpkgs-no-force-pushes branch from ba75447 to 650775b Compare June 19, 2025 16:33
@wolfgangwalther wolfgangwalther changed the title rulesets/nixpkgs: remove exceptions for release team rulesets/nixpkgs: remove exception for force push for release team Jun 19, 2025
@wolfgangwalther
Copy link
Contributor Author

I documented the reason for the exception in rulesets/nixpkgs/README.md instead.

Copy link
Member

@infinisil infinisil left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good to me! I'll go ahead with the implementation of this

@infinisil infinisil merged commit d089f66 into NixOS:main Jul 7, 2025
2 checks passed
@wolfgangwalther wolfgangwalther deleted the rulesets-nixpkgs-no-force-pushes branch July 7, 2025 21:43
infinisil added a commit that referenced this pull request Jul 10, 2025
The rulesets were never reexported after applying #131
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants