Repository: incubator-hivemall Updated Branches: refs/heads/master d902dc257 -> f6bd64449
Fix CI failure ## What changes were proposed in this pull request? This PR should fix CI failure like: https://travis-ci.org/apache/incubator-hivemall/builds/343706510 - Set env variable JAVA8_HOME which is enforced by pom for building Spark 2.2 - Fix Spark-related CI configuration ## What type of PR is it? Hot Fix ## What is the Jira issue? N/A ## How was this patch tested? Check the latest CI results below. Author: Takuya Kitazawa <[email protected]> Closes #134 from takuti/travis-set-JAVA8_HOME. Project: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/commit/f6bd6444 Tree: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/tree/f6bd6444 Diff: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/diff/f6bd6444 Branch: refs/heads/master Commit: f6bd644498b57776dcd729615baba25eb3a710ed Parents: d902dc2 Author: Takuya Kitazawa <[email protected]> Authored: Wed Feb 21 11:20:35 2018 +0900 Committer: Makoto Yui <[email protected]> Committed: Wed Feb 21 11:20:35 2018 +0900 ---------------------------------------------------------------------- .travis.yml | 1 + bin/run_travis_tests.sh | 14 ++++++++------ spark/pom.xml | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/f6bd6444/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 950a5ed..7bd2e0c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,7 @@ branches: - develop before_install: + - export JAVA8_HOME=$(jdk_switcher home oraclejdk8) - mvn validate -Pcompile-xgboost notifications: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/f6bd6444/bin/run_travis_tests.sh ---------------------------------------------------------------------- diff --git a/bin/run_travis_tests.sh b/bin/run_travis_tests.sh index f1bffec..d0ad8c2 100755 --- a/bin/run_travis_tests.sh +++ b/bin/run_travis_tests.sh @@ -31,17 +31,19 @@ fi set -ev -cd $HIVEMALL_HOME +cd $HIVEMALL_HOME/spark -mvn -q scalastyle:check test -Pspark-2.1 +export MAVEN_OPTS="-XX:MaxPermSize=256m" -# Tests the spark-2.2/spark-2.0 modules only in the following runs +mvn -q scalastyle:check -Pspark-2.0 -pl spark-2.0 -am test -Dtest=none + +mvn -q scalastyle:check clean -Pspark-2.1 -pl spark-2.1 -am test -Dtest=none + +# spark-2.2 runs on Java 8+ if [[ ! -z "$(java -version 2>&1 | grep 1.8)" ]]; then mvn -q scalastyle:check clean -Djava.source.version=1.8 -Djava.target.version=1.8 \ - -Pspark-2.2 -pl spark/spark-2.2 -am test -Dtest=none + -Pspark-2.2 -pl spark-2.2 -am test -Dtest=none fi -mvn -q scalastyle:check clean -Pspark-2.0 -pl spark/spark-2.0 -am test -Dtest=none - exit 0 http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/f6bd6444/spark/pom.xml ---------------------------------------------------------------------- diff --git a/spark/pom.xml b/spark/pom.xml index d018b8d..8279df1 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -236,7 +236,7 @@ <failOnWarning>false</failOnWarning> <sourceDirectory>${basedir}/src/main/scala</sourceDirectory> <testSourceDirectory>${basedir}/src/test/scala</testSourceDirectory> - <configLocation>spark/scalastyle-config.xml</configLocation> + <configLocation>${main.basedir}/spark/scalastyle-config.xml</configLocation> <outputFile>${basedir}/target/scalastyle-output.xml</outputFile> <inputEncoding>${project.build.sourceEncoding}</inputEncoding> <outputEncoding>${project.reporting.outputEncoding}</outputEncoding> @@ -292,4 +292,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project>
