Merge pull request #3321 from anon8675309/gitlab-ci

Gitlab ci

.gitlab-ci.yml

@@ -11,6 +11,7 @@ deb:
     - docker
   script:
     - yes "" | ./utils/do_debian_package.sh --snapshot=stable --type=binary --interactive=no --dput=no --debbuild-extra=--no-sign || true
+  timeout: 2h
   artifacts:
     paths:
       - '*.deb'

utils/do_debian_package.sh

@@ -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