summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@oath.com>2017-10-16 14:03:29 +0200
committerBjørn Christian Seime <bjorncs@oath.com>2017-10-16 21:16:10 +0200
commitc85d8be22ce8095271b0925b1acf78210e089f78 (patch)
treeb71338dde3af7c8cb53a8f3b0550363c2c492907 /.travis.yml
parent3db5ac405d7716d9faefe1c933efbe501fbaea92 (diff)
Improve Travis builds
Test install step as separate job for PRs. Use single job for complete build for master branch.
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml18
1 files changed, 12 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index 24583dca26b..20937176541 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,10 +4,6 @@ sudo: required
services:
- docker
-env:
- - PLATFORM_LANGUAGE=cpp
- - PLATFORM_LANGUAGE=java
-
cache:
timeout: 900
directories:
@@ -28,5 +24,15 @@ install: true
language: minimal
-script: ./travis/travis.sh $PLATFORM_LANGUAGE
-
+script: ./travis/travis.sh ${BUILD_TYPE}
+
+matrix:
+ include:
+ - env: BUILD_TYPE="java"
+ if: type = pull_request
+ - env: BUILD_TYPE="cpp"
+ if: type = pull_request
+ - env: BUILD_TYPE="install"
+ if: type = pull_request
+ - env: BUILD_TYPE="full"
+ if: NOT type = pull_request