diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2015-05-12 11:51:46 -0400 |
|---|---|---|
| committer | Mike Morris <michael.patrick.morris@gmail.com> | 2015-05-12 11:51:46 -0400 |
| commit | 3034d9d7040f8cf3a845530d5000c7c37a55d22f (patch) | |
| tree | ac04c39f3ca83fc91225eb6305d641c4ae2eb8f0 /.travis.yml | |
| parent | 106212158630c1fd15aec2225bcbb01268c8bae0 (diff) | |
| download | qtlocation-mapboxgl-3034d9d7040f8cf3a845530d5000c7c37a55d22f.tar.gz | |
Revert "Revert "Merge pull request #1429 from mapbox/travis-setup""
This reverts commit 3ccb0b5610a716b8c2bb602cc52f96bc2fb2ff03.
Conflicts:
.travis.yml
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 0572b166b1..54f3cb5cc7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -82,9 +82,15 @@ env: - secure: "nQqSM8rd7OHtV4MqmNqVnkrVHqxKqQsaWRYk4/nPdhbeVWtTtkk0df711LrF1TUtbEPEewHxYUvTZ/UXmwJNeoKdzTHavI8hnatRkgjyxGERPn1il1Otelht9I+LQQHf+plrpRjVWBrNIW0Zox1B3cqn6d3NglpbXrEQ2EjYGNA=" - KIF_SCREENSHOTS="${TRAVIS_BUILD_DIR}/screenshots" +before_install: +- source ./scripts/travis_helper.sh + install: - ./scripts/${FLAVOR}/install.sh +before_script: +- if [ -f ./scripts/${FLAVOR}/setup.sh ]; then source ./scripts/${FLAVOR}/setup.sh; fi + script: - ./scripts/${FLAVOR}/run.sh |