| 21 May 2021 |
raboof | what is our policy around targeting staging-next? I like https://github.com/NixOS/nixpkgs/pull/123502#issuecomment-845748379 but don't feel qualified to make that call :) | 09:12:14 |
sterni | In reply to @raboof:matrix.org what is our policy around targeting staging-next? I like https://github.com/NixOS/nixpkgs/pull/123502#issuecomment-845748379 but don't feel qualified to make that call :) I'd say we backport this PR via staging-21.05, targeting staging-next should mostly be about stabilizing staging-next / fixing regressions imo | 09:13:44 |
sterni | and having additional rebuilds doesn't really help | 09:13:52 |
| Pascal Bach joined the room. | 09:14:17 |
sterni | I guess jonringer should have the final say as they are managing the staging-next cycle :) | 09:15:08 |
raboof | ok, so things merged into staging-21.05 will not be in the initial 21.05 release but will be in some later 21.05 update? | 09:19:38 |
sterni | oh no they can be in the initial release I think | 09:25:10 |
sterni | there should be enough time between branch-off and release to get some things in via the staging-21.05, I'd think | 09:25:47 |
raboof | ah even better, then that sounds like a good way forward | 09:34:57 |
sterni | already have a list of two staging PRs to backport :) Unfortunately we'll have to wait for branch-off for the branch to exist (naturally) | 09:36:11 |
raboof | (I'll ask jonringer to add this to https://discourse.nixos.org/t/21-05-release-schedule/12528) | 09:38:37 |
sterni | oh branch-off is today? | 09:53:35 |
sterni | I thought 25th | 09:53:37 |
| higebu joined the room. | 10:20:30 |
| davidak joined the room. | 10:44:31 |
vika (she/her) 🏳️⚧️ | In reply to @sternenseemann:systemli.org oh branch-off is today? Oh, the branch-off is today?n | 11:11:13 |
vika (she/her) 🏳️⚧️ | * Oh, the branch-off is today?! | 11:11:18 |
vika (she/her) 🏳️⚧️ | Oh no | 11:11:22 |
vika (she/her) 🏳️⚧️ | I forgot to rebase the fix I wanted to the master branch and make a PR | 11:11:42 |
sterni | I think it's gonna take a bit longer until staging-next is merged (some annoying build failures) | 11:11:51 |
vika (she/her) 🏳️⚧️ | And I'm not home right now! | 11:12:00 |
vika (she/her) 🏳️⚧️ | I'm panicking | 11:12:08 |
sterni | Also you can always backport your fixes to the release-21.05 branch after branch-off :) Shouldn't be too much hassle | 11:12:14 |
vika (she/her) 🏳️⚧️ | Whew | 11:12:29 |
vika (she/her) 🏳️⚧️ | I just hope it's gonna be accepted for cherry-picking :e | 11:12:41 |
sterni | There's still over a week until the earliest projected release date | 11:12:33 |
vika (she/her) 🏳️⚧️ | I should be able to make it in time | 11:12:51 |
sterni | I don't see a reason why not | 11:19:59 |
| iammrinal0 joined the room. | 11:55:47 |
| sephi joined the room. | 11:57:50 |