sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-15 00:02:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Include travis build name in dash results (ie qt5/qt4)

Browse Source
This commit is contained in:
Nyall Dawson 2016-05-13 12:01:39 +10:00
parent 57d114e2e2
commit c1d84dee96
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -7,6 +7,7 @@ matrix:
- os: linux
language: cpp
env:
- BUILD=qt4
- QT_VERSION=4
- LLVM_VERSION=3.8
sudo: false
@ -58,6 +59,7 @@ matrix:
- os: linux
language: python # This lets us use newer python versions from virtualenv
env:
- BUILD=qt5
- QT_VERSION=5
- LLVM_VERSION=3.8
sudo: false
@ -89,6 +91,8 @@ matrix:
- clang-3.8
# OSX based build with QT4 and Python 2
- os: osx
env:
- BUILD=osx
git:
depth: 30

4
qgis-test-travis.ctest
View File

@ -9,9 +9,9 @@ SET (CTEST_BUILD_COMMAND "/usr/bin/make -j2 -i -k")
SET (CTEST_SITE "travis-ci.org")
IF ($ENV{TRAVIS_PULL_REQUEST} STREQUAL "false")
# No pull request
SET (CTEST_BUILD_NAME "$ENV{TRAVIS_BRANCH} ($ENV{TRAVIS_COMMIT})")
SET (CTEST_BUILD_NAME "$ENV{TRAVIS_BRANCH} ($ENV{BUILD}) ($ENV{TRAVIS_COMMIT})")
ELSE()
SET (CTEST_BUILD_NAME "PR: $ENV{TRAVIS_PULL_REQUEST} / $ENV{TRAVIS_BRANCH} ($ENV{TRAVIS_COMMIT})")
SET (CTEST_BUILD_NAME "PR: $ENV{TRAVIS_PULL_REQUEST} / $ENV{TRAVIS_BRANCH} ($ENV{BUILD}) ($ENV{TRAVIS_COMMIT})")
ENDIF()
SET (CTEST_BUILD_CONFIGURATION "Release")
SET (CTEST_TEST_TIMEOUT 60) # 60 seconds