You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by jh...@apache.org on 2017/10/02 21:00:11 UTC
[11/15] calcite git commit: Make Travis CI builds work (Christian
Beikov)
Make Travis CI builds work (Christian Beikov)
Close apache/calcite#542
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/dc2b86af
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/dc2b86af
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/dc2b86af
Branch: refs/heads/master
Commit: dc2b86afcf46bfefbadfc4d56b2ad5482e757244
Parents: 796a28f
Author: Christian Beikov <ch...@gmail.com>
Authored: Fri Sep 22 10:29:39 2017 +0200
Committer: Julian Hyde <jh...@apache.org>
Committed: Mon Oct 2 11:13:44 2017 -0700
----------------------------------------------------------------------
.travis.yml | 11 +++++++----
pom.xml | 4 +++-
2 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/dc2b86af/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 7232f1f..f8cd9b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,9 +17,6 @@
# limitations under the License.
#
language: java
-jdk:
- - oraclejdk8
- - oraclejdk7
branches:
only:
- master
@@ -30,11 +27,17 @@ branches:
install:
- mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
script:
- - mvn -Dsurefire.useFile=false test
+ - unset _JAVA_OPTIONS
+ - mvn -Dsurefire.useFile=false -Dsurefire.parallel= test
git:
depth: 10000
sudo: false
cache:
directories:
- $HOME/.m2
+matrix:
+ fast_finish: true
+ include:
+ - jdk: openjdk7
+ - jdk: oraclejdk8
# End .travis.yml
http://git-wip-us.apache.org/repos/asf/calcite/blob/dc2b86af/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f459a1c..1e25c0c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,8 @@ limitations under the License.
</mailingLists>
<properties>
+ <surefire.parallel>both</surefire.parallel>
+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<top.dir>${project.basedir}</top.dir>
<version.major>1</version.major>
@@ -817,7 +819,7 @@ limitations under the License.
<configuration>
<threadCount>1</threadCount>
<perCoreThreadCount>true</perCoreThreadCount>
- <parallel>both</parallel>
+ <parallel>${surefire.parallel}</parallel>
<forkMode>once</forkMode>
<systemProperties>
<systemProperty>