From d94a3712be0efc53d81800d4d7efe583735b7aa9 Mon Sep 17 00:00:00 2001 From: Syping Date: Wed, 30 May 2018 08:53:27 +0200 Subject: [PATCH] add git head if not tagged --- .travis/travis.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.travis/travis.sh b/.travis/travis.sh index 413c830..e1459ec 100755 --- a/.travis/travis.sh +++ b/.travis/travis.sh @@ -8,10 +8,17 @@ elif [ "${TRAVIS_OS_NAME}" == "osx" ]; then brew install lua fi +# Check is build not tagged +if [ "${TRAVIS_TAG}" == "" ]; then + export EXECUTABLE_TAG=-$(git rev-parse --short HEAD) +else + export EXECUTABLE_TAG= +fi + if [ `git name-rev --tags --name-only $(git rev-parse HEAD)` == "undefined" ]; then export APPLICATION_VERSION=`lua -e 'for line in io.lines("config.h") do local m = string.match(line, "#define GTA5SYNC_APPVER \"(.+)\"$"); if m then print(m); os.exit(0) end end'`; else export APPLICATION_VERSION=`git name-rev --tags --name-only $(git rev-parse HEAD)`; fi export PACKAGE_VERSION=$(grep -oE '^[^\-]*' <<< $APPLICATION_VERSION) export PACKAGE_BUILD=$(grep -oP '\-\K.+' <<< $APPLICATION_VERSION) -export EXECUTABLE_VERSION=${PACKAGE_VERSION}${PACKAGE_BUILD} +export EXECUTABLE_VERSION=${PACKAGE_VERSION}${PACKAGE_BUILD}${EXECUTABLE_TAG} if [[ ! ${PACKAGE_BUILD} ]]; then export PACKAGE_BUILD=1; fi export PROJECT_DIR=$(pwd)