| 20 Nov 2023 |
 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 |
| raitobezarius | We could just scrap off the whole branch and restart it | 20:16:30 |
| raitobezarius | We are not saying to force push on master to be clear | 20:16:36 |
| infinisil | In reply to @raitobezarius:matrix.org
We could just scrap off the whole branch and restart it I don't think you can delete it | 20:16:52 |
| raitobezarius | No, we cannot because of the hook | 20:17:02 |
| raitobezarius | We could before the changes, though. | 20:17:06 |
| raitobezarius | We could say that next time force push has to be restrained but someone has to write the new instructions | 20:17:14 |
| raitobezarius | And PR the new workflow | 20:17:18 |
| raitobezarius | In reply to @figsoda:matrix.org
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 I think I tried and it failed but maybe I also failed to do it properly; regardless, too much divergence from the handbook is not good | 20:17:49 |
| raitobezarius | figsoda: Can you reconvene a time for the next branch-off attempt? | 20:18:21 |
| raitobezarius | For tomorrow? | 20:18:24 |
| infinisil | From what you told me though, the workflow in https://github.com/NixOS/release-wiki/pull/70 seems to be working though. It only doesn't work because of a mistake, which wasn't documented before. | 20:18:47 |
