| 21 Nov 2023 |
 Philip Taron (UTC-8) | * Thank you all so much for all the work done to make that possible. | 20:07:43 |
| 22 Nov 2023 |
 hexa | staging-next-23.11 is still on the wrong base | 00:19:06 |
| hexa | I get mails for the backport action failing | 00:19:36 |
 figsoda | yeah we didnt have the permission | 00:19:39 |
| hexa |
diff --cc nixos/release.nix
index 0d23d42f7827,a1b4508ca40b..000000000000
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@@ -12,7 -12,7 +12,13 @@@ le
version = fileContents ../.version;
versionSuffix =
++<<<<<<< HEAD
+ (if stableBranch then "." else "beta") + "${toString nixpkgs.revCount - 551050}.${nixpkgs.shortRev}";
++||||||| cdfc4c54b233
++ (if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}";
++=======
+ (if stableBranch then "." else "beta") + "${toString (nixpkgs.revCount - 551362)}.${nixpkgs.shortRev}";
++>>>>>>> origin/release-23.11
# Run the tests for each platform. You can run a test by doing
# e.g. ‘nix-build release.nix -A tests.login.x86_64-linux’,
| 00:19:44 |
| hexa | * diff --cc nixos/release.nix
index 0d23d42f7827,a1b4508ca40b..000000000000
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@@ -12,7 -12,7 +12,13 @@@ le
version = fileContents ../.version;
versionSuffix =
++<<<<<<< HEAD
+ (if stableBranch then "." else "beta") + "${toString nixpkgs.revCount - 551050}.${nixpkgs.shortRev}";
++||||||| cdfc4c54b233
++ (if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}";
++=======
+ (if stableBranch then "." else "beta") + "${toString (nixpkgs.revCount - 551362)}.${nixpkgs.shortRev}";
++>>>>>>> origin/release-23.11
# Run the tests for each platform. You can run a test by doing
# e.g. ‘nix-build release.nix -A tests.login.x86_64-linux’,
| 00:19:54 |
| figsoda | should I cherry pick the commit into a pull request to avoid the force push? | 00:21:58 |
| hexa | The merge I could do myself as well | 00:22:27 |
| hexa | the question was whether you plan to kill the branch and push the new base | 00:22:47 |
| hexa | * the question is whether you plan to kill the branch and push the new base | 00:23:58 |
| figsoda | tbh its probably fine to just merge into the existing branch | 00:24:30 |
| figsoda | https://github.com/NixOS/nixpkgs/pull/269090 | 00:32:33 |
| figsoda | ooh looks like the check-by-name | 00:35:28 |
| figsoda | * https://github.com/NixOS/nixpkgs/pull/269091 | 00:35:35 |
| figsoda | ooh looks like the check-by-name action doesn't work until the channels are ready | 00:35:56 |
 infinisil | Ahh good point | 00:36:10 |
| infinisil | Hmm.. | 00:36:59 |
 raitobezarius | In reply to @figsoda:matrix.org
yeah we didnt have the permission You have permissions | 00:38:35 |
| raitobezarius | You can force push staging | 00:38:52 |
| infinisil | I could make a fix for the pkgs/by-name workflow, would that be good? And which base branch? | 00:39:25 |
| hexa | please not staging 😄 and not staging-next | 00:39:30 |
| hexa | please just staging-next-23.11 | 00:39:33 |
| raitobezarius | What hexa said | 00:39:47 |
| hexa | In reply to @infinisil:matrix.org
I could make a fix for the pkgs/by-name workflow, would that be good? And which base branch? release-23.11? | 00:39:49 |
| raitobezarius | You can force push staging-next-23.11 * | 00:40:03 |
| hexa | just make it the same as release-23.11 | 00:40:24 |
| hexa | no jobset for release-23.11 yet 😲 | 00:40:50 |
| raitobezarius | It's a slow branch off | 00:41:33 |
| figsoda | I did the force push | 00:43:58 |
| figsoda | It should© be good now | 00:44:25 |
