From 7e3a8a1ba7c27d1508abc2e21921774f3cf29089 Mon Sep 17 00:00:00 2001 From: Elod Illes Date: Thu, 11 May 2023 16:19:38 +0200 Subject: 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 fe125da63b6508788654f0dab721f13005c09d25) (cherry picked from commit 09f85a8a922e4ad68271886d2389042d4f4d6896) (cherry picked from commit abd9a34a6014730620cee15a44f328e48e57398e) (cherry picked from commit acb31f01b1f10e1101c520657b2e6432a99e4b35) (cherry picked from commit 41895386349ee8d8acea6b1278a2b54c6f9d750f) --- tools/check-cherry-picks.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/check-cherry-picks.sh b/tools/check-cherry-picks.sh index 5a449c520b..e985d871da 100755 --- a/tools/check-cherry-picks.sh +++ b/tools/check-cherry-picks.sh @@ -18,7 +18,7 @@ hashes=$(git show --format='%b' --quiet $commit_hash | sed -nr 's/^.cherry picke checked=0 branches+="" for hash in $hashes; do - branch=$(git branch -a --contains "$hash" 2>/dev/null| grep -oE '(master|stable/[a-z]+)') + branch=$(git branch -a --contains "$hash" 2>/dev/null| grep -oE '(master|stable/[a-z0-9.]+)') if [ $? -ne 0 ]; then echo "Cherry pick hash $hash not on any master or stable branches" exit 1 -- cgit v1.2.1