aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorge Aparicio <jorge@japaric.io>2018-08-27 14:45:43 +0200
committerJorge Aparicio <jorge@japaric.io>2018-08-27 14:45:43 +0200
commitc9c5ade13218ba9d7255fb00298309d18d892ee9 (patch)
tree711aa9c4cda9fb7dc837aafe43a6346884b5852d
parent2b6b513b8978ac63fd12ee7049c85fce1194a487 (diff)
enable builds on master
-rw-r--r--.travis.yml1
-rw-r--r--ci/script.sh4
2 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 8e81e82..f7257c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,6 +33,7 @@ after_script: set +e
branches:
only:
+ - master
- staging
- trying
diff --git a/ci/script.sh b/ci/script.sh
index 9e91aad..0d42ff3 100644
--- a/ci/script.sh
+++ b/ci/script.sh
@@ -18,4 +18,6 @@ main() {
cargo check --target $TARGET --examples
}
-main
+if [ $TRAVIS_BRANCH != master ]; then
+ main
+fi