diff --git a/tests/tests-ci.sh b/tests/tests-ci.sh index 8a64a25..f9819f7 100755 --- a/tests/tests-ci.sh +++ b/tests/tests-ci.sh @@ -39,6 +39,10 @@ ulimit -a -H # error handling performed separately set +e +# print version number +./linuxdeployqt-*-x86_64.AppImage --version + +# TODO: reactivate tests #bash -e tests/tests.sh true RESULT=$? diff --git a/tools/linuxdeployqt/linuxdeployqt.pro b/tools/linuxdeployqt/linuxdeployqt.pro index f131a11..1d9e3f5 100644 --- a/tools/linuxdeployqt/linuxdeployqt.pro +++ b/tools/linuxdeployqt/linuxdeployqt.pro @@ -24,10 +24,14 @@ DEFINES += LINUXDEPLOYQT_GIT_COMMIT="'\"$(shell git rev-parse --short HEAD)\"'" DEFINES += BUILD_DATE="'\"$(shell env LC_ALL=C date -u '+%Y-%m-%d %H:%M:%S %Z')\"'" -equals($$(TRAVIS_BUILD_NUMBER), "") { +_BUILD_NUMBER = $$(TRAVIS_BUILD_NUMBER) + +isEmpty(_BUILD_NUMBER) { + message(Not building on Travis CI, tagging build as local dev build) DEFINES += BUILD_NUMBER="'\"\"'" } else { - DEFINES += BUILD_NUMBER="'\"$$(TRAVIS_BUILD_NUMBER)\"'" + message(Building on Travis CI build, build number $$_BUILD_NUMBER) + DEFINES += BUILD_NUMBER="'\"$$_BUILD_NUMBER\"'" } DEFINES += LINUXDEPLOYQT_VERSION="'\"$(shell git describe --tags $(shell git rev-list --tags --skip=1 --max-count=1) --abbrev=0)\"'"