From 406b42711c4102373bf09dd53bf9c96a6d86a24b Mon Sep 17 00:00:00 2001 From: sashan Date: Thu, 2 Oct 2025 16:34:54 +0200 Subject: [PATCH] - rebased on recent changes --- review-tools/ghmerge | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/review-tools/ghmerge b/review-tools/ghmerge index e5e7bd4..96b50c5 100755 --- a/review-tools/ghmerge +++ b/review-tools/ghmerge @@ -199,6 +199,7 @@ fi TARGET_REPO=$(jq -r '.base.repo.name' $PR_URL_CONTENTS) RTM_LABEL=$(jq -r '.labels[] | select(.name == "approval: ready to merge") | .name' $PR_URL_CONTENTS) URGENT_LABEL=$(jq -r '.labels[] | select(.name == "severity: urgent") | .name' $PR_URL_CONTENTS) +HOLD_LABEL=$(jq -r '.labels[] | select(.name|test("hold*")) | .name' $PR_URL_CONTENTS) if [ "$TARGET_REPO" != "openssl" ] then @@ -207,9 +208,12 @@ elif [ -z "$RTM_LABEL" -a -z "$URGENT_LABEL" ] then >&2 echo "This PR has neither the ready to merge or urgent label set, can't merge" exit 1 +elif [ -n "$HOLD_LABEL" ] +then + >&2 echo "This PR has hold label, can't merge" + exit 1 fi - ORIG_REF=`git rev-parse --abbrev-ref HEAD` # usually this will be 'master' STASH_OUT=`git stash` WORK="copy-of-${WHO}-${BRANCH}"