aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml5
-rw-r--r--appveyor.yml9
2 files changed, 8 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index 2d6ea862e1..6e1d15e741 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -438,8 +438,9 @@ script:
# Branch matrix. Not all branches are Travis-ready so we limit branches here.
branches:
only:
- - master
- - trunk # for pull request. TODO: use `fork = true` or something.
+ # Because default branch is still "trunk", we build only "trunk" to avoid
+ # doubly building on master and trigger CI on Pull Request.
+ - trunk # TODO: s/master/trunk/ when the default branch is switched to master on 7/1.
- ruby_2_4
- ruby_2_5
- ruby_2_6
diff --git a/appveyor.yml b/appveyor.yml
index 9ecb083b0a..029a0b677a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,10 +3,11 @@ version: '{build}'
shallow_clone: true
platform:
- x64
-## Still allowing trunk branch for pull request. TODO: Skip non-pull-request trunk build.
-# branches:
-# except:
-# - trunk # mirrored master runs CI
+branches:
+ except:
+ # Because default branch is still "trunk", we build only "trunk" to avoid
+ # doubly building on master and trigger CI on Pull Request.
+ - master # mirrored from trunk
environment:
ruby_version: "24-%Platform%"
zlib_version: "1.2.11"