From 5c1c923f32cbddc4a02ea2b4fc341aedb1f07211 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 28 May 2025 15:29:50 +0200 Subject: [PATCH] ci/check-cherry-picks: allow cherry-picking from haskell-updates and python-updates Those are protected branches, which can't be force pushed to - so the commits will remain. Thus, we can also backport from them. (cherry picked from commit ea636d1728f25328511401c4919eec96e7426de0) (cherry picked from commit 5f23ca9c9961d1da61991f196845b231d286b0d8) --- 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 580d6da6a38e..2d1e6eb7c03c 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=${PICKABLE_BRANCHES:-master staging release-??.?? staging-??.??} +PICKABLE_BRANCHES="master release-??.?? staging-??.?? haskell-updates python-updates" problem=0 # Not everyone calls their remote "origin"