From 19a1276370bb0a05de5528bd24e414098a0c6a96 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Jul 2023 14:17:03 +0200 Subject: [PATCH 1/2] workflows/periodic-merge: drop 22.11 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 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 From c31bda504ca006eb4cbb2c40177396a69819e98e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 4 Jul 2023 14:17:58 +0200 Subject: [PATCH 2/2] lib/trivial: Bump oldestSupportedReleaseto to 23.05 --- lib/trivial.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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`. */