From d58e064e851b474900ba782d181d592e29339827 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Tue, 21 Apr 2020 10:14:19 -0700 Subject: [PATCH] Identify Stable or Daily build --- .travis.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 14cfb9194..ee84f11cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -190,11 +190,18 @@ before_script: script: # run qmake - mkdir ${SHADOW_BUILD_DIR} && cd ${SHADOW_BUILD_DIR} + - if [ "${TRAVIS_TAG}" ]; then + echo "Stable build" + export STABLE_OR_DAILY=StableBuild; + else + echo "Daily build" + export STABLE_OR_DAILY=DailyBuild; + fi # Due to possible bug in Qt 5.11 WarningsAsErrorsOn is off for Linux builds. Hopefully back on once that is resolved. - if [ "${SPEC}" = "macx-clang" ]; then - qmake -r ${TRAVIS_BUILD_DIR}/qgroundcontrol.pro CONFIG+=${CONFIG} CONFIG+=WarningsAsErrorsOn -spec ${SPEC}; + qmake -r ${TRAVIS_BUILD_DIR}/qgroundcontrol.pro CONFIG+=${CONFIG} CONFIG+=${STABLE_OR_DAILY} CONFIG+=WarningsAsErrorsOn -spec ${SPEC}; else - qmake -r ${TRAVIS_BUILD_DIR}/qgroundcontrol.pro CONFIG+=${CONFIG} -spec ${SPEC}; + qmake -r ${TRAVIS_BUILD_DIR}/qgroundcontrol.pro CONFIG+=${CONFIG} CONFIG+=${STABLE_OR_DAILY} -spec ${SPEC}; fi # compile -- 2.22.0