23 Nov 2024 |
emily | we did a separate branch to PR into for https://github.com/NixOS/nixpkgs/pull/354107, though that was a ~2-person collaborative project that took a couple weeks | 00:56:09 |
emily | rebuilds aren't an issue – staging isn't built | 00:56:19 |
emily | (that's why we have staging-next ) | 00:56:24 |
Tomodachi94 (they/them) | In reply to@emilazy:matrix.org how many commits are we talking here in expectation? Unsure. That depends on how many dependencies on ant-contrib there are | 01:06:26 |
emily | my intuition would be that you can get away with just having a PR | 01:10:19 |
emily | but I could be wrong :) | 01:10:22 |
emily | rebuilds aren't worth worrying about anyway | 01:10:27 |
emily | have you seen the CONTRIBUTING.md section about the stagling flow? | 01:10:37 |
emily | we periodically cut staging-next from staging and that's what gets built on Hydra | 01:10:55 |
emily | otherwise everything just queues up there waiting for the next -next | 01:11:04 |
Tomodachi94 (they/them) | I'm mostly worried about the mandatory 1-week waiting period for modifications to packages (there are a few maintainers who don't appear to be responsive) | 01:13:41 |
Tomodachi94 (they/them) | * I'm mostly worried about the mandatory 1-week waiting period for modifications to packages (there are at least a few maintainers who don't appear to be responsive) | 01:13:51 |
Tomodachi94 (they/them) | And also worried about reviewer fatigue with one massive PR (and, since it would be a pretty big PR, keeping it rebased could become difficult if it sits for a while) | 01:15:33 |
emily | that period is made up | 01:15:40 |
emily | I don't think I've ever seen it followed other than for like "this package has an active maintainer and this is a significant breaking change" | 01:16:00 |
emily | if we did staging like that every cycle would take two months | 01:16:15 |
emily | FWIW I think you can also just do separate PRs directly into staging ? | 01:16:38 |
emily | it's okay to break stuff and then fix it as long as you have a plan for fixing it | 01:16:45 |
emily | e.g., we just bumped LLVM and GCC and those definitely break stuff | 01:16:53 |
Tomodachi94 (they/them) | In reply to@emilazy:matrix.org FWIW I think you can also just do separate PRs directly into staging ? This was my plan if I was talked out of a separate Ant branch (which you just did) | 01:17:15 |
Tomodachi94 (they/them) | In reply to@emilazy:matrix.org it's okay to break stuff and then fix it as long as you have a plan for fixing it Ah okay. Should I draftify the setup hook PR and reuse it for all of the refactors, then undraft it once it's done? | 01:18:53 |
emily | up to you :) the two things that make sense are to do it all in one PR or to land the setup hook PR with known regressions and then fix them one by one | 01:19:38 |
emily | large stacks aren't that bad really especially if you use Jujutsu | 01:19:55 |
Tomodachi94 (they/them) | In reply to@emilazy:matrix.org up to you :) the two things that make sense are to do it all in one PR or to land the setup hook PR with known regressions and then fix them one by one I think I fixed all of the regressions already with the setup hook (ran nixpkgs-review overnight one day, then looked through the failures and fixed them) | 01:20:49 |
emily | ah | 01:21:16 |
emily | wait, but then what was that about PRing into a branch? | 01:21:22 |
Tomodachi94 (they/them) | In reply to@emilazy:matrix.org wait, but then what was that about PRing into a branch? I originally targeted master with the setup hook PR before I saw how many packages it rebuilt (after said overnight build) | 01:23:01 |
Tomodachi94 (they/them) | I'm a bit confused about what you're asking | 01:23:10 |
Tomodachi94 (they/them) | In reply to@emilazy:matrix.org up to you :) the two things that make sense are to do it all in one PR or to land the setup hook PR with known regressions and then fix them one by one I don't anticipate many regressions with the other three big changes I have planned (splitting ant-contrib, removing our custom wrapper, building from source) | 01:23:32 |
emily | ah, sorry | 01:23:41 |