Skip to content

Commit b2829a8

Browse files
committed
- rebased on recent changes
Reviewed-by: Neil Horman <[email protected]> Reviewed-by: Tomas Mraz <[email protected]> Reviewed-by: Paul Dale <[email protected]> (Merged from #225)
1 parent 05219ec commit b2829a8

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

review-tools/ghmerge

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ fi
199199
TARGET_REPO=$(jq -r '.base.repo.name' $PR_URL_CONTENTS)
200200
RTM_LABEL=$(jq -r '.labels[] | select(.name == "approval: ready to merge") | .name' $PR_URL_CONTENTS)
201201
URGENT_LABEL=$(jq -r '.labels[] | select(.name == "severity: urgent") | .name' $PR_URL_CONTENTS)
202+
HOLD_LABEL=$(jq -r '.labels[] | select(.name|test("hold*")) | .name' $PR_URL_CONTENTS)
202203

203204
if [ "$TARGET_REPO" != "openssl" ]
204205
then
@@ -207,9 +208,12 @@ elif [ -z "$RTM_LABEL" -a -z "$URGENT_LABEL" ]
207208
then
208209
>&2 echo "This PR has neither the ready to merge or urgent label set, can't merge"
209210
exit 1
211+
elif [ -n "$HOLD_LABEL" ]
212+
then
213+
>&2 echo "This PR has hold label, can't merge"
214+
exit 1
210215
fi
211216

212-
213217
ORIG_REF=`git rev-parse --abbrev-ref HEAD` # usually this will be 'master'
214218
STASH_OUT=`git stash`
215219
WORK="copy-of-${WHO}-${BRANCH}"

0 commit comments

Comments
 (0)