From 642de212a6ec1d4e76f7cca957163bbeaef85e88 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 27 May 2025 20:00:24 +0200 Subject: [PATCH] maintainer/scripts/check-cherry-picks: fix calling from outside nixpkgs The CI job calls this as trusted/maintainers/..., i.e. with a working directory outside the checkout. The git commands inside the script assume to be inside the checkout, though, so let's force that. --- maintainers/scripts/check-cherry-picks.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/maintainers/scripts/check-cherry-picks.sh b/maintainers/scripts/check-cherry-picks.sh index c846fa108df2..0e02c709d8f5 100755 --- a/maintainers/scripts/check-cherry-picks.sh +++ b/maintainers/scripts/check-cherry-picks.sh @@ -8,6 +8,9 @@ if [ $# != "2" ] ; then exit 2 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-??.??} problem=0