| 14 Nov 2025 |
leona | i'm doing staging branch-off now. | 09:52:17 |
leona | staging-25.11 and staging-next-25.11 branches exist now (hydra jobsets will be created later) | 10:04:30 |
leona | release-notes + periodic-merge workflows in https://github.com/NixOS/nixpkgs/pull/461526 | 10:04:50 |
| MATE joined the room. | 17:54:26 |
| Florian set a profile picture. | 18:40:39 |
| Corngood joined the room. | 19:46:11 |
| 16 Nov 2025 |
dotlambda | What's the point of staging-next-25.11? Won't staging-next be merged into master before branch-off? | 15:05:12 |
dotlambda | I'm asking cause I have a fix for something broken on staging-next and want to make sure it reaches 25.11 too | 15:05:46 |
vcunat | The current staging-next will. | 15:07:44 |
vcunat | The next one won't reach 25.11. | 15:07:50 |
leona | Primarily we have staging-25.11 because the current staging branch won’t reach 25.11 anymore and we want to make it possible directly create the backport PR to staging-25.11. To not complicate things too much, we already create the staging-next-25.11 branch even though it has no technical sense until branchoff | 15:08:04 |
dotlambda | In reply to @vcunat:matrix.org The next one won't reach 25.11. I'm aware | 15:08:07 |
vcunat | I think we need staging-next-25.11 already for the auto-merging workflow to work right. | 15:08:32 |
leona | i.e. just give your PR to staging, the backport staging-25.11 label | 15:08:35 |
dotlambda | In reply to @leona:leona.is Primarily we have staging-25.11 because the current staging branch won’t reach 25.11 anymore and we want to make it possible directly create the backport PR to staging-25.11. To not complicate things too much, we already create the staging-next-25.11 branch even though it has no technical sense until branchoff So it's just there for the regular automatic merges? | 15:08:36 |
dotlambda | I thought those don't make too much sense before release-25.11 is created | 15:09:02 |
leona | Yes. It would work without it, but then the workflow would again look different than for the other branches and I didn’t like it | 15:09:23 |
dotlambda | I think this is more confusing than helpful and in the future, staging-next-26.05 should only be created after the last merge of staging next into master before branch-off | 15:10:00 |
leona | We currently auto merge
master -> staging-next -> staging
master -> staging-next-25.11 -> staging-25.11
| 15:10:13 |
leona | You don’t want staging-25.11 to exist in this stage too? This was an explicit wish by multiple contributors because previously they forgot to backport PRs from staging that didn’t reach the release | 15:11:27 |
leona | I mean yes, we could of course create staging-next-25.11 only at the time of branch off | 15:12:26 |
dotlambda | The latter of those automatic merges will have to be changed anyway (from master to release-25.11) so until that time why not directly merge master into staging-25.11? | 15:13:27 |
dotlambda | In reply to @leona:leona.is You don’t want staging-25.11 to exist in this stage too? This was an explicit wish by multiple contributors because previously they forgot to backport PRs from staging that didn’t reach the release It certainly should. I only talking about -next | 15:13:58 |
dotlambda | * It certainly should. I'm only talking about -next | 15:15:03 |
leona | I think that should be possible. The only reason why this currently works this way was me thinking of a workflow in a relatively short time | 15:16:05 |
| 17 Nov 2025 |
| MATE changed their display name from mate to MATE. | 06:11:44 |
| Uraraka ~ Ochaco changed their display name from dwd to Peri. | 23:36:50 |
| 18 Nov 2025 |
| Uraraka ~ Ochaco changed their profile picture. | 01:17:55 |
| Uraraka ~ Ochaco changed their profile picture. | 01:23:24 |
dish [Fox/It/She] | just for documentation purposes: I'm planning to open my release notes organization PR(alphabetizing all non-highlight release notes) after release-25.11 branchoff on nov 25. After that point, anyone adding to the release notes should ensure the alphabetization is retained. | 02:47:23 |