diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2016-07-26 14:47:14 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2016-08-05 11:42:22 +0200 |
| commit | 163fc3c11350e714978b3f06daac5df931828152 (patch) | |
| tree | 225852964fc8fe6a44ac74133cd44ad88e77c500 | |
| parent | 140908568b5e5759e888715e8795c11e7c64218c (diff) | |
| download | qtlocation-mapboxgl-163fc3c11350e714978b3f06daac5df931828152.tar.gz | |
[build] fix various CI builds
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rwxr-xr-x | docker/linux/test.sh | 2 | ||||
| -rw-r--r-- | platform/macos/bitrise.yml | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index df06cd4e2d..b36c9eefa7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,7 +45,7 @@ before_script: - cmake --version script: - make linux - - make test-linux + - make test after_script: - ccache --show-stats - ./platform/linux/scripts/after_script.sh ${TRAVIS_JOB_NUMBER} ${TRAVIS_TAG:-} @@ -151,7 +151,6 @@ cache: directories: - $HOME/.ccache - $HOME/.cache/pip - - .mason - node_modules - mason_packages/.binaries diff --git a/docker/linux/test.sh b/docker/linux/test.sh index 21632daa18..207f7679cf 100755 --- a/docker/linux/test.sh +++ b/docker/linux/test.sh @@ -21,4 +21,4 @@ source ./scripts/travis_helper.sh source ./scripts/travis_setup.sh make linux -make test-linux +make test diff --git a/platform/macos/bitrise.yml b/platform/macos/bitrise.yml index 0987049437..3b0eca3efd 100644 --- a/platform/macos/bitrise.yml +++ b/platform/macos/bitrise.yml @@ -33,7 +33,7 @@ workflows: gem install xcpretty --no-rdoc --no-ri export BUILDTYPE=Debug make macos - make test-macos + make test - is_debug: 'yes' - slack: title: Post to Slack |