Repository: mahout Updated Branches: refs/heads/master df1f064a0 -> 79539f126
reverting commits: commit df1f064a08ffeef1f413c807d97664d3e6de8118 Author: Andrew Palumbo <[email protected]> Date: Tue Apr 19 20:20:11 2016 -0400 (nojira): follow dl4j's travis configuration using a 30 second ping to keep long tests alive commit 48f05d6c0cc7790810225e138239b4b8418c2979 Author: Andrew Palumbo <[email protected]> Date: Tue Apr 19 19:27:23 2016 -0400 (nojira) fix double install entry in .travis.yml. also fix unreasonable memory request commit 3fe00616bf3c41befbd3dd70427451891bac742b Author: Andrew Palumbo <[email protected]> Date: Tue Apr 19 19:17:21 2016 -0400 (Nojira) minor fix to readme to trigger travis build. commit 9fcebb0efcea1f04e4c1cf4a40f12e907a79e80a Author: Andrew Palumbo <[email protected]> Date: Tue Apr 19 19:07:45 2016 -0400 (nojira) .travis.yml add travis_wait for timing out tests, use some settings from jenkins as MAVEN_OPTS Project: http://git-wip-us.apache.org/repos/asf/mahout/repo Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/79539f12 Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/79539f12 Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/79539f12 Branch: refs/heads/master Commit: 79539f1269dfb3e654a89e77d598908481073471 Parents: df1f064 Author: Andrew Palumbo <[email protected]> Authored: Tue Apr 19 20:54:44 2016 -0400 Committer: Andrew Palumbo <[email protected]> Committed: Tue Apr 19 20:57:42 2016 -0400 ---------------------------------------------------------------------- .travis.yml | 16 ++++++---------- README.md | 2 +- runtests.sh | 39 --------------------------------------- 3 files changed, 7 insertions(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mahout/blob/79539f12/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 4776f5f..6072b26 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,12 @@ -sudo: true +sudo: false cache: directories: - $HOME/.m2 -script: - language: java +install: true + +language: java branches: only: @@ -15,7 +16,7 @@ branches: matrix: include: - jdk: "oraclejdk7" - env: PROFILE="-Dhadoop.version=2.4.1 -Dflink.version=1.0.1 -Dspark.version=1.5.2" + env: PROFILE="-Dhadoop.version=2.4.1 -Dscala-2.10 -Dflink.version=1.0.1 -Dspark.version=1.5.2" git: depth: 10 @@ -25,7 +26,7 @@ notifications: env: global: - MAVEN_OPTS="-Xmx2g -Xms256m -XX:MaxPermSize=512m" + JAVA_OPTS=-Xmx6g before_install: - wget https://archive.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.zip @@ -33,10 +34,5 @@ before_install: - export M2_HOME=$PWD/apache-maven-3.3.9 - export PATH=$M2_HOME/bin:$PATH - script: - - cd /home/travis/build/mahout/ && chmod +x ./runtests.sh && ./runtests.sh - - - http://git-wip-us.apache.org/repos/asf/mahout/blob/79539f12/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 771b248..8ef6eec 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ You will need a `$JAVA_HOME`, and if you are running on Spark, you will also nee Note when running the spark-shell job it can help to set some JVM options so you don't run out of memory: ``` -$ MAHOUT_OPTS="-Xmx6g -XX:MaxPermSize=512m" mahout spark-shell +$MAHOUT_OPTS="-Xmx6g -XX:MaxPermSize=512m" mahout spark-shell ``` ####Using Mahout as a Library http://git-wip-us.apache.org/repos/asf/mahout/blob/79539f12/runtests.sh ---------------------------------------------------------------------- diff --git a/runtests.sh b/runtests.sh deleted file mode 100644 index de45649..0000000 --- a/runtests.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash -# Abort on Error -set -e - -export PING_SLEEP=30s -export WORKDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -export BUILD_OUTPUT=$WORKDIR/build.out - -touch $BUILD_OUTPUT - -dump_output() { - echo Tailing the last 500 lines of output: - tail -500 $BUILD_OUTPUT -} -error_handler() { - echo ERROR: An error was encountered with the build. - dump_output - exit 1 -} -# If an error occurs, run our error handler to output a tail of the build -trap 'error_handler' ERR - -# Set up a repeating loop to send some output to Travis. - -bash -c "while true; do echo \$(date) - building ...; sleep $PING_SLEEP; done" & -PING_LOOP_PID=$! - - -# My build is using maven, but you could build anything with this, E.g. -# your_build_command_1 >> $BUILD_OUTPUT 2>&1 -# your_build_command_2 >> $BUILD_OUTPUT 2>&1 -mvn clean test >> $BUILD_OUTPUT 2>&1 - -# The build finished without returning an error so dump a tail of the output -dump_output - -# nicely terminate the ping output loop -kill $PING_LOOP_PID -
