diff options
| author | Elod Illes <elod.illes@est.tech> | 2023-05-11 16:19:38 +0200 |
|---|---|---|
| committer | Elod Illes <elod.illes@est.tech> | 2023-05-11 17:04:15 +0200 |
| commit | abd9a34a6014730620cee15a44f328e48e57398e (patch) | |
| tree | 444b0dba6b4095c2208a326ad553b4d2e7fdad93 | |
| parent | f1009524f2778c482f9e67cc6195f1101b5f6bdc (diff) | |
| download | nova-abd9a34a6014730620cee15a44f328e48e57398e.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
(cherry picked from commit fe125da63b6508788654f0dab721f13005c09d25)
(cherry picked from commit 09f85a8a922e4ad68271886d2389042d4f4d6896)
| -rwxr-xr-x | tools/check-cherry-picks.sh | 2 |
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 |