Merge pull request #3321 from anon8675309/gitlab-ci

Gitlab ci
This commit is contained in:
Isaac Connor
2021-08-05 13:34:05 -04:00
committed by GitHub
2 changed files with 2 additions and 1 deletions

View File

@@ -122,7 +122,7 @@ else
BRANCH=`git describe --tags $(git rev-list --tags --max-count=1)`;
if [ -z "$BRANCH" ]; then
# 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"
fi
if [ "$BRANCH" == "" ]; then