Merge pull request #8675 from DonLakeFlyer/TravisStableDaily

Identify Stable or Daily build

Merge pull request #8675 from DonLakeFlyer/TravisStableDaily
Identify Stable or Daily build
de20001f · Don Gagne · GitHub · 8300cdc5 · 11805062 · de20001f
Unverified Commit de20001f authored Apr 21, 2020 by Don Gagne Committed by GitHub Apr 21, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

.travis.yml .travis.yml +9 -2

No files found.
--- 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