Skip to content
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

Update the documentation for how staging-next works #137501

Closed
alyssais opened this issue Sep 12, 2021 · 4 comments
Closed

Update the documentation for how staging-next works #137501

alyssais opened this issue Sep 12, 2021 · 4 comments
Labels
2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md 6.topic: policy discussion

Comments

@alyssais
Copy link
Member

The documentation for the staging-next branch currently says

19.7.3. Staging-next branch

The staging-next branch is for stabilizing mass-rebuilds submitted to the staging branch prior to merging them into master. Mass-rebuilds must go via the staging branch. It must only see non-breaking commits that are fixing issues blocking it from being merged into the master branch.

If the branch is already in a broken state, please refrain from adding extra new breakages. Stabilize it for a few days and then merge into master.

The "must only see non-breaking commits that are fixing issues blocking it from being merged into the master branch" is not at all how staging-next actually works today. Mesa updates always go to staging-next, and so do small updates that depend on other things in staging-next that haven't reached master yet, e.g. #137430.

I don't mind if this is the way staging-next works now, but I do mind that the documentation doesn't reflect this use, because it means that people who have read and are trying to follow the rules in the manual are using a different, more restrictive set of rules from everybody else.

@jtojnar
Copy link
Member

jtojnar commented Sep 13, 2021

Maybe something like: “It must only see commits that do not interfere with the stabilization, primarily non-breaking commits that are fixing issues blocking it from being merged into the master branch. But low risk changes like leaf packages that depend on a feature being stabilized are also acceptable.”

The concern is that it might empower people to push more stuff to staging-next and breaking stabilization (e.g. “surely, this wonʼt break anything”)

I have no idea about the reasoning for why mesa goes there.

@stale
Copy link

stale bot commented Apr 25, 2022

I marked this as stale due to inactivity. → More info

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Apr 25, 2022
@FRidh
Copy link
Member

FRidh commented Oct 27, 2022

Related #83381

@samueldr
Copy link
Member

The documentation has moved here:

The wording changed, too. I presume usage might have too, since.

I'm tentatively closing this issue, @alyssais feel free to re-open if this is wrong.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md 6.topic: policy discussion
Projects
None yet
Development

No branches or pull requests

4 participants