summaryrefslogtreecommitdiff
path: root/tools/check-cherry-picks.sh
diff options
context:
space:
mode:
authorElod Illes <elod.illes@est.tech>2023-05-11 16:19:38 +0200
committerElod Illes <elod.illes@est.tech>2023-05-11 16:23:53 +0200
commitfe125da63b6508788654f0dab721f13005c09d25 (patch)
treed0e42a787f4f0abf47629e2cbf3149cd46ccb355 /tools/check-cherry-picks.sh
parente9a54ff3508efbb1dea6b80fc5d970a8385c6ed4 (diff)
downloadnova-fe125da63b6508788654f0dab721f13005c09d25.tar.gz
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
Diffstat (limited to 'tools/check-cherry-picks.sh')
-rwxr-xr-xtools/check-cherry-picks.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/check-cherry-picks.sh b/tools/check-cherry-picks.sh
index 46cef8c225..3042aa1659 100755
--- a/tools/check-cherry-picks.sh
+++ b/tools/check-cherry-picks.sh
@@ -23,7 +23,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