mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-14 20:18:39 +00:00
release: fix pattern in release.sh script for checking branch name
This commit is contained in:
parent
39c3eacb7d
commit
04290879b7
|
@ -266,7 +266,7 @@ if [ "$CUR_BRANCH" = master ]; then
|
||||||
number_is_odd "${VERSION_ARR[1]}" || die "Unexpected version number on master. Should be an odd development version"
|
number_is_odd "${VERSION_ARR[1]}" || die "Unexpected version number on master. Should be an odd development version"
|
||||||
[ "$RELEASE_MODE" = devel -o "$RELEASE_MODE" = rc1 -o "$RELEASE_MODE" = major-post ] || die "Unexpected branch name \"$CUR_BRANCH\" for \"$RELEASE_MODE\""
|
[ "$RELEASE_MODE" = devel -o "$RELEASE_MODE" = rc1 -o "$RELEASE_MODE" = major-post ] || die "Unexpected branch name \"$CUR_BRANCH\" for \"$RELEASE_MODE\""
|
||||||
else
|
else
|
||||||
re='^nm-[0-9][1-9]*-[0-9][1-9]*$'
|
re='^nm-[0-9]+-[0-9]+$'
|
||||||
[[ "$CUR_BRANCH" =~ $re ]] || die "Unexpected current branch $CUR_BRANCH. Should be master or nm-?-??"
|
[[ "$CUR_BRANCH" =~ $re ]] || die "Unexpected current branch $CUR_BRANCH. Should be master or nm-?-??"
|
||||||
if number_is_odd "${VERSION_ARR[1]}"; then
|
if number_is_odd "${VERSION_ARR[1]}"; then
|
||||||
# we are on a release candiate branch.
|
# we are on a release candiate branch.
|
||||||
|
|
Loading…
Reference in a new issue