Merge pull request NixOS#284807 from figsoda/workflow

Clean up 23.05 stuff after EOL
gaurang-ingale · Jan 29, 2024 · dcf2524 · dcf2524
2 parents b6e2519 + e08ce8d
commit dcf2524
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml
@@ -35,10 +35,6 @@ jobs:
         pairs:
           - from: master
             into: haskell-updates
-          - from: release-23.05
-            into: staging-next-23.05
-          - from: staging-next-23.05
-            into: staging-23.05
           - from: release-23.11
             into: staging-next-23.11
           - from: staging-next-23.11

diff --git a/lib/trivial.nix b/lib/trivial.nix
@@ -189,7 +189,7 @@ in {
      they take effect as soon as the oldest release reaches end of life. */
   oldestSupportedRelease =
     # Update on master only. Do not backport.
-    2305;
+    2311;
 
   /* Whether a feature is supported in all supported releases (at the time of
      release branch-off, if applicable). See `oldestSupportedRelease`. */