Simplified branch detection in build scripts for GitLab CI

This commit is contained in:
anon8675309 2021-07-24 10:37:07 -05:00 committed by Isaac Connor
parent f5272c99b3
commit 4cbda5e645
1 changed files with 1 additions and 1 deletions

View File

@ -122,7 +122,7 @@ else
BRANCH=`git describe --tags $(git rev-list --tags --max-count=1)`; BRANCH=`git describe --tags $(git rev-list --tags --max-count=1)`;
if [ -z "$BRANCH" ]; then if [ -z "$BRANCH" ]; then
# This should only happen in CI environments where tag info isn't available # This should only happen in CI environments where tag info isn't available
BRANCH=`grep ' release$' distros/fedora/zoneminder.spec | head -n 1 | sed -e 's/ release//g' -e 's/[^0-9]*//'` BRANCH=`cat version`
echo "Building branch $BRANCH" echo "Building branch $BRANCH"
fi fi
if [ "$BRANCH" == "" ]; then if [ "$BRANCH" == "" ]; then