Skip to content

Commit 7e3a8a1

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) (cherry picked from commit 09f85a8) (cherry picked from commit abd9a34) (cherry picked from commit acb31f0) (cherry picked from commit 4189538)
1 parent 9813eac commit 7e3a8a1

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
@@ -18,7 +18,7 @@ hashes=$(git show --format='%b' --quiet $commit_hash | sed -nr 's/^.cherry picke
1818
checked=0
1919
branches+=""
2020
for hash in $hashes; do
21-
branch=$(git branch -a --contains "$hash" 2>/dev/null| grep -oE '(master|stable/[a-z]+)')
21+
branch=$(git branch -a --contains "$hash" 2>/dev/null| grep -oE '(master|stable/[a-z0-9.]+)')
2222
if [ $? -ne 0 ]; then
2323
echo "Cherry pick hash $hash not on any master or stable branches"
2424
exit 1

0 commit comments

Comments
 (0)