Update version bump check so it works on master branch (#26146)
This commit is contained in:
parent
c5c2b44ecc
commit
4cfcfe51a0
|
@ -5,7 +5,7 @@ usage() {
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
usage: $0 branch tag
|
usage: $0 branch tag
|
||||||
|
|
||||||
Checks that the tag matches the branch and the Cargo.toml versions match the tag.
|
Checks that the tag matches the branch (unless branch is master) and the Cargo.toml versions match the tag.
|
||||||
EOF
|
EOF
|
||||||
exit 0
|
exit 0
|
||||||
}
|
}
|
||||||
|
@ -13,13 +13,14 @@ EOF
|
||||||
branch="$1"
|
branch="$1"
|
||||||
tag="$2"
|
tag="$2"
|
||||||
|
|
||||||
|
[[ -n $tag ]] || usage
|
||||||
echo "branch: $branch tag: $tag"
|
echo "branch: $branch tag: $tag"
|
||||||
|
|
||||||
# The tag is expected to be the branch name plus a patch number. eg:
|
# The tag is expected to be the branch name plus a patch number (unless branch is master). eg:
|
||||||
# tag: v1.2.3
|
# tag: v1.2.3
|
||||||
# branch: v1.2
|
# branch: v1.2
|
||||||
if [[ "$tag" != "$branch"* ]]; then
|
if [[ "$tag" != "$branch"* && $branch != "master" ]]; then
|
||||||
>&2 echo "Tag must start with the branch name. Tag: $tag Branch: $branch"
|
>&2 echo "Tag must start with the branch name (unless branch is master). Tag: $tag Branch: $branch"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue