diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml index dd0c1a2333003..abfb51244fd66 100644 --- a/.github/workflows/periodic-merge-24h.yml +++ b/.github/workflows/periodic-merge-24h.yml @@ -34,10 +34,6 @@ jobs: pairs: - from: master into: haskell-updates - - from: release-22.11 - into: staging-next-22.11 - - from: staging-next-22.11 - into: staging-22.11 - from: release-23.05 into: staging-next-23.05 - from: staging-next-23.05 diff --git a/lib/trivial.nix b/lib/trivial.nix index 26e4b32400f24..34c100959e6ff 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -179,7 +179,7 @@ rec { they take effect as soon as the oldest release reaches end of life. */ oldestSupportedRelease = # Update on master only. Do not backport. - 2211; + 2305; /* Whether a feature is supported in all supported releases (at the time of release branch-off, if applicable). See `oldestSupportedRelease`. */