diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 95eb8f483..f5de71b8b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ deb: tags: - docker script: - - yes "" | ./utils/do_debian_package.sh --snapshot=stable --branch=1.36.1 --type=binary --interactive=no --dput=no --debbuild-extra=--no-sign || true + - yes "" | ./utils/do_debian_package.sh --snapshot=stable --type=binary --interactive=no --dput=no --debbuild-extra=--no-sign || true artifacts: paths: - '*.deb' diff --git a/utils/do_debian_package.sh b/utils/do_debian_package.sh index fe41365f7..685b56bc0 100755 --- a/utils/do_debian_package.sh +++ b/utils/do_debian_package.sh @@ -120,6 +120,11 @@ else if [ "$BRANCH" == "" ]; then #REV=$(git rev-list --tags --max-count=1) 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]*//'` + echo "Building branch $BRANCH" + fi if [ "$BRANCH" == "" ]; then echo "Unable to determine latest stable branch!" exit 0;