branch-off: modify based on branch-off of 25.11 #107
Conversation
| - staging-24.05 | ||
|
|
||
| Example configuration: [nixos:release-23.11](https://hydra.nixos.org/jobset/nixos/release-23.11#tabs-configuration) | ||
| Example configuration: [nixos:release-25.11](https://hydra.nixos.org/jobset/nixos/release-25.11#tabs-configuration) |
There was a problem hiding this comment.
It's possible to add a note somewhere that it seems easiest to just clone the previous release's jobsets (by a single click per jobset) and just rewrite the version number on a few places.
There was a problem hiding this comment.
I added that. I must say that I'm not that happy about this whole section and I think we can remove much of that. Still it would be good to document a default somewhere.
leona-ya
force-pushed
the
leona/branch-off-changes
branch
from
4095167 to
b48b13e
Compare
| export NEXTVER=24.11 | ||
| ``` | ||
|
|
||
| 1. Add the release name to [`nixos/doc/manual/release-notes/rl-$NEXTVER.section.md`](https://github.com/NixOS/nixpkgs/commit/bf470a4fddca6315d1b7c256a873c90f755b02d9#diff-417feb28ebc7ab0109746fef515d6cccdcd5af5c7386e1ce0b186db9b8e5677b), [`doc/release-notes/rl-2411.section.md`](https://github.com/NixOS/nixpkgs/commit/bf470a4fddca6315d1b7c256a873c90f755b02d9#diff-c5ba8855198f95e7fdb39bcd1106bb29c96b85c14bdfc4030b235a02806bf9b3) |
There was a problem hiding this comment.
If we use a variable, we probably should do it on both of them and not just one. Note that they have the . removed in both of these, but $NEXTVER includes a . when set.
| 1. Add the release name to [`nixos/doc/manual/release-notes/rl-$NEXTVER.section.md`](https://github.com/NixOS/nixpkgs/commit/bf470a4fddca6315d1b7c256a873c90f755b02d9#diff-417feb28ebc7ab0109746fef515d6cccdcd5af5c7386e1ce0b186db9b8e5677b), [`doc/release-notes/rl-2411.section.md`](https://github.com/NixOS/nixpkgs/commit/bf470a4fddca6315d1b7c256a873c90f755b02d9#diff-c5ba8855198f95e7fdb39bcd1106bb29c96b85c14bdfc4030b235a02806bf9b3) | |
| 1. Add the release name to [`nixos/doc/manual/release-notes/rl-$NEXTVER.section.md`](https://github.com/NixOS/nixpkgs/commit/bf470a4fddca6315d1b7c256a873c90f755b02d9#diff-417feb28ebc7ab0109746fef515d6cccdcd5af5c7386e1ce0b186db9b8e5677b), [`doc/release-notes/rl-$NEXTVER.section.md`](https://github.com/NixOS/nixpkgs/commit/bf470a4fddca6315d1b7c256a873c90f755b02d9#diff-c5ba8855198f95e7fdb39bcd1106bb29c96b85c14bdfc4030b235a02806bf9b3) |
| on master. | ||
|
|
||
| 1. Commit the changes ([23.05 example](https://github.com/NixOS/nixpkgs/commit/2c28f1de7cdc10be556d2106108411dd2482794b) + [this commit](https://github.com/NixOS/nixpkgs/commit/2c6ae7132ca558f1052da0eececed3cad191b883)) | ||
| 1. Commit the changes as `$NEXTVER is <codeName>`([25.11 example](https://github.com/NixOS/nixpkgs/commit/2493002b10ccef0880f72d7720538f91fb4f7434)) |
There was a problem hiding this comment.
Maybe also do treefmt and eval here before committing.
| 1. Update [.github/workflows/periodic-merge-24h.yml](https://github.com/NixOS/nixpkgs/commit/bf470a4fddca6315d1b7c256a873c90f755b02d9#diff-a4f6ea695ede268916c760fe782e9645a8cab5b27747e4baa994bf59f3e4e07b) so that | ||
| - `release-$NEWVER` (instead of `master`) gets merged into `staging-next-$NEWVER` | ||
|
|
||
| 1. Update [.github/labeler-no-sync.yml](https://github.com/NixOS/nixpkgs/commit/fb0fb7420fcafaaced083c6767da35617f2837f3) so that it includes `backport release-25.11`. |
There was a problem hiding this comment.
Thanks for adding this. I went through the docs, but couldn't find the second part of this: After branch-off, the new release branch must be changed and the existing entry for the backport label must be removed from that file. The related PR was this: NixOS/nixpkgs#464874
(is there already a step with a PR towards the release branch after its creation?)
There was a problem hiding this comment.
Ah, I didn't know that. I will add that later
There was a problem hiding this comment.
Is this required to not create a loop
- CI change targeting master
- Auto-Backport PR gets created targeting release-25.11
- That auto backport PR gets the backport release-25.05 label?
Or otherwise, why can't we just remove backport release-25.05 from .github/labelers-no-sync.yml at the deprecation period of 25.05
There was a problem hiding this comment.
Yes, we want to backport the CI changes to both branches straight from master - and the additional backport label on the backport PR itself creates a useless PR. I tried doing "chained backports" instead, which would only require changing the master branch after branch-off, but this quickly became very annoying to deal with.
4 participants
No description provided.