Skip to content

Commit 09f85a8

Browse files
author
Elod Illes
committed
CI: fix backport validator for new branch naming
validate-backport job started to fail as only old stable branch naming is accepted. This patch extends the script to allow numbers and dot as well in the branch names (like stable/2023.1). Change-Id: Icbdcd5d124717e195d55d9e42530611ed812fadd (cherry picked from commit fe125da)
1 parent c94a411 commit 09f85a8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

tools/check-cherry-picks.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ hashes=$(git show --format='%b' --quiet $commit_hash | sed -nr 's/^.cherry picke
2323
checked=0
2424
branches+=""
2525
for hash in $hashes; do
26-
branch=$(git branch -a --contains "$hash" 2>/dev/null| grep -oE '(master|stable/[a-z]+)')
26+
branch=$(git branch -a --contains "$hash" 2>/dev/null| grep -oE '(master|stable/[a-z0-9.]+)')
2727
if [ $? -ne 0 ]; then
2828
echo "Cherry pick hash $hash not on any master or stable branches"
2929
exit 1

0 commit comments

Comments
 (0)