From 9fc8a3074f9f53da74f52d1f20c8738a4658c6f5 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 29 Jan 2024 12:07:40 -0500 Subject: [PATCH 1/2] workflows/periodic-merge: drop 23.05 jobs --- .github/workflows/periodic-merge-24h.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml index 270283bff478..bd7aadfbade1 100644 --- 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 From e08ce8d1d12a30de76768e8b03c2faf74351ad7f Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 29 Jan 2024 12:08:59 -0500 Subject: [PATCH 2/2] lib/trivial: bump oldestSupportedRelease to 23.11 --- lib/trivial.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/trivial.nix b/lib/trivial.nix index b2796096e8bc..f27cfb04f074 100644 --- 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`. */