| 20 Nov 2023 |
 figsoda | I think we have too little time left to get it into staging-next, backported to staging-next-23.11, merged into release-23.11, and tested before the final release | 18:36:51 |
 Vladimír Čunát | I recall that we once shifted from 3+9 to 5+11 to better fit the GNOME cycle. (one of the reasons, but it's related to Ubuntu+Fedora's cycles) | 18:42:10 |
| Vladimír Čunát | * I recall that we once shifted from 3+9 to 5+11 to better fit the GNOME cycle. (as one of the main reasons, but it's related to Ubuntu+Fedora's cycles) | 18:42:35 |
| figsoda | branch-off starting in a few minutes https://jitsi.lassul.us/nixos-2311 | 18:57:27 |
| figsoda | raitobezarius are you ready to join? | 19:03:50 |
 raitobezarius | yep sorry | 19:03:58 |
| raitobezarius | coming | 19:03:59 |
| raitobezarius | So, as expected, infinisil, the whole changes on master broke the release workflow unfortunately :) | 20:02:49 |
| raitobezarius | We will have to postpone the branch-off. | 20:02:57 |
 infinisil | raitobezarius: figsoda: Did you try https://github.com/NixOS/release-wiki/pull/70 or a variation thereof? | 20:11:21 |
| raitobezarius | Doesn't work | 20:11:44 |
| raitobezarius | We need to edit an commit that has been mistakenly pushed on the release branch | 20:11:52 |
| raitobezarius | And we needed to edit tags, etc. | 20:11:57 |
| raitobezarius | It doesn't really make sense to protect a branch we are preparing tbh | 20:12:24 |
| raitobezarius | I guess someone used a wildcard on the protection of release branches | 20:12:38 |
| figsoda | Yeah, another thing is next time we should probably push to master before tagging, so there should no longer be any force pushes needed | 20:12:58 |
| infinisil | In reply to @raitobezarius:matrix.org
We need to edit an commit that has been mistakenly pushed on the release branch Why not git revert? | 20:13:14 |
| infinisil | Or just edit the contents and push another commit? | 20:13:26 |
| raitobezarius | In reply to @infinisil:matrix.org
Why not git revert? Because that would diverge from the classical workflow | 20:13:27 |
| raitobezarius | We can do workflow modifications before we do release | 20:13:37 |
| raitobezarius | Not during the moment we do release | 20:13:42 |
| infinisil | In reply to @raitobezarius:matrix.org
And we needed to edit tags, etc. Tags aren't protected afaik? | 20:14:16 |
| raitobezarius | GitHub insist otherwise | 20:14:25 |
| raitobezarius | Until we figured out that the UI enable us to modify them | 20:14:32 |
| raitobezarius | But the CLI interaction with the Git server doesn't. | 20:14:38 |
| raitobezarius | But even so, doesn't change the fact that we cannot amend the beta commit | 20:15:25 |
| raitobezarius | * But even so, doesn't change the fact that we cannot amend the beta commit (on the release branch) | 20:15:31 |
| infinisil | Personally I'd prefer no force pushes, but sure | 20:16:03 |
| figsoda | I don't think I tried to delete the tag from the CLI, I was going to search it because I could never remember the command, but I realized I could just use the web UI | 20:16:04 |
| raitobezarius | In reply to @infinisil:matrix.org
Personally I'd prefer no force pushes, but sure It doesn't matter, the branch has seen no public usage yet | 20:16:21 |
