From 649b5585c41ef241304e3b3d48bda72572d9256a Mon Sep 17 00:00:00 2001 From: anon8675309 Date: Sat, 24 Jul 2021 10:37:07 -0500 Subject: [PATCH] Simplified branch detection in build scripts for GitLab CI --- utils/do_debian_package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/do_debian_package.sh b/utils/do_debian_package.sh index 685b56bc0..cec604b40 100755 --- a/utils/do_debian_package.sh +++ b/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