Skip to content

Commit

Permalink
Include travis build name in dash results (ie qt5/qt4)
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed May 15, 2016
1 parent 57d114e commit c1d84de
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions .travis.yml
Expand Up @@ -7,6 +7,7 @@ matrix:
- os: linux
language: cpp
env:
- BUILD=qt4
- QT_VERSION=4
- LLVM_VERSION=3.8
sudo: false
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -89,6 +91,8 @@ matrix:
- clang-3.8
# OSX based build with QT4 and Python 2
- os: osx
env:
- BUILD=osx

git:
depth: 30
Expand Down
4 changes: 2 additions & 2 deletions qgis-test-travis.ctest
Expand Up @@ -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
Expand Down

0 comments on commit c1d84de

Please sign in to comment.