| 27 Sep 2021 |
Vladimír Čunát | * The merge happens "silently" and then the resulting staging-next gets a PR against master. | 10:19:27 |
Vladimír Čunát | * The merge happens "silently" and then the resulting staging-next gets a PR against master. (the last link above is the current one) | 10:20:17 |
trofi | Is it a fast-forward most of the time? | 16:34:03 |
Vladimír Čunát | I think nowadays usually people don't use --no-ff when merging staging into staging-next, and it tends to be fast-forward. | 16:39:06 |
Vladimír Čunát | As for staging-next to master, there I'd dislike a fast-forward merge. | 16:39:57 |
| 28 Sep 2021 |
happysalada | It's a littlle odd at the moment, staging-next is a priority but the unstable build has a lower priority and so the last staging-next changes haven't made it onto unstable yet | 23:09:48 |
lukegb (he/him) | I think that's mostly down to the fact that unstable is broken | 23:27:07 |
lukegb (he/him) | so the channel won't advance | 23:27:17 |
| 29 Sep 2021 |
Vladimír Čunát | trunk-combined jobset has a bit less "build shares" configuration than staging-next (one third, roughly). I agree it would be better to reverse their order. | 05:47:02 |
Vladimír Čunát | trunk has more shares than the other two (which helps trunk-combined except for NixOS stuff, i.e. mainlytests). | 05:48:21 |
Vladimír Čunát | By the way, there's been lots of work scheduled in the past few days, so I wasn't running into adding more so far, e.g. https://github.com/NixOS/nixpkgs/pull/139514#issuecomment-927260195 I suppose we'll also want a staging-21.05 iteration soon, too, as we have more than week-old pushes in there with CVEs. | 05:52:58 |
happysalada | no problem at all, I'm still getting feedback on it. I've tested building chromium and it works fine, so hopefully it should be fairly ready to merge. | 10:01:02 |
happysalada | In reply to @lukegb:zxcvbnm.ninja so the channel won't advance the channel seems broken just because of cancel buids (It seems). It looks like the channel is a little starved, just like vladimir was saying | 10:02:28 |
lukegb (he/him) | It'd be quite nice if we could update the topic of the room to mention the latest PR... | 12:01:37 |