From 6847270de2df51637ec2d3b1d382d8cb89163585 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Thu, 29 May 2025 12:46:25 +0200 Subject: [PATCH 1/2] ci/check-cherry-picks: add staging as pickable branch again This was accidentally removed in ea636d1728f25328511401c4919eec96e7426de0, left-over from debugging. --- ci/check-cherry-picks.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/check-cherry-picks.sh b/ci/check-cherry-picks.sh index 612174925f57..427f28a237ab 100755 --- a/ci/check-cherry-picks.sh +++ b/ci/check-cherry-picks.sh @@ -11,7 +11,7 @@ fi # Make sure we are inside the nixpkgs repo, even when called from outside cd "$(dirname "${BASH_SOURCE[0]}")" -PICKABLE_BRANCHES="master release-??.?? staging-??.?? haskell-updates python-updates" +PICKABLE_BRANCHES="master staging release-??.?? staging-??.?? haskell-updates python-updates" problem=0 # Not everyone calls their remote "origin" From 802f353d0506e4f6fb5b482989e5ae277d26dc8e Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 30 May 2025 13:04:26 +0200 Subject: [PATCH 2/2] ci/check-cherry-picks: add staging-next as pickable branch Even though there is only a small window where a commit is not on staging, but already on staging-next, it is technically valid to backport commits from staging-next, too. --- ci/check-cherry-picks.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/check-cherry-picks.sh b/ci/check-cherry-picks.sh index 427f28a237ab..e7c9e289b22b 100755 --- a/ci/check-cherry-picks.sh +++ b/ci/check-cherry-picks.sh @@ -11,7 +11,7 @@ fi # Make sure we are inside the nixpkgs repo, even when called from outside cd "$(dirname "${BASH_SOURCE[0]}")" -PICKABLE_BRANCHES="master staging release-??.?? staging-??.?? haskell-updates python-updates" +PICKABLE_BRANCHES="master staging release-??.?? staging-??.?? haskell-updates python-updates staging-next staging-next-??.??" problem=0 # Not everyone calls their remote "origin"