You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by jo...@apache.org on 2017/03/16 11:22:34 UTC
zeppelin git commit: Revert "[ZEPPELIN-2230] clear bower_contents if
bower.json changed"
Repository: zeppelin
Updated Branches:
refs/heads/master d0fc54bc7 -> dc8c4dbf1
Revert "[ZEPPELIN-2230] clear bower_contents if bower.json changed"
This reverts commit a716308ce07cc09106048464f5f76711f9b31dfb.
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/dc8c4dbf
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/dc8c4dbf
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/dc8c4dbf
Branch: refs/heads/master
Commit: dc8c4dbf13e537ce624d8cddb8879dc2ed210b9f
Parents: d0fc54b
Author: Jongyoul Lee <jo...@apache.org>
Authored: Thu Mar 16 20:21:16 2017 +0900
Committer: Jongyoul Lee <jo...@apache.org>
Committed: Thu Mar 16 20:22:14 2017 +0900
----------------------------------------------------------------------
.travis.yml | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/dc8c4dbf/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index f34cdd8..ab4e8f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,6 @@ cache:
- ${HOME}/R
- zeppelin-web/node
- zeppelin-web/node_modules
- - zeppelin-web/bower_components
addons:
apt:
@@ -71,13 +70,6 @@ matrix:
env: PYTHON="3" SCALA_VER="2.11" SPARK_VER="2.0.0" HADOOP_VER="2.6" PROFILE="-Pspark-2.0 -Phadoop-2.6 -Ppyspark -Pscala-2.11" BUILD_FLAG="package -pl spark,python -am -DskipTests -DskipRat" TEST_FLAG="test -DskipRat" MODULES="-pl zeppelin-interpreter,zeppelin-display,spark-dependencies,spark,python" TEST_PROJECTS="-Dtest=org.apache.zeppelin.spark.PySpark*Test,org.apache.zeppelin.python.* -Dpyspark.test.exclude='' -DfailIfNoTests=false"
before_install:
- # check files included in commit range, clear bower_components if a bower.json file has changed.
- # bower cache clearing can also be forced by putting "bower clear" or "clear bower" in a commit message
- - changedfiles=$(git diff --name-only $TRAVIS_COMMIT_RANGE)
- - echo $changedfiles
- - hasbowerchanged=$(echo $changedfiles | grep -c "bower.json" || true);
- - clearcache=$(git log $TRAVIS_COMMIT_RANGE | grep -c -E "clear bower|bower clear" || true)
- - if [ "$hasbowerchanged" -gt 0 ] || [ "$clearcache" -gt 0 ]; then echo "Clearing bower_components cache"; rm -r zeppelin-web/bower_components; npm cache clear; else echo "Using cached bower_components."; fi
- echo "MAVEN_OPTS='-Xms1024M -Xmx2048M -XX:MaxPermSize=1024m -XX:-UseGCOverheadLimit -Dorg.slf4j.simpleLogger.defaultLogLevel=warn'" >> ~/.mavenrc
- ./testing/install_external_dependencies.sh
- ls -la .spark-dist ${HOME}/.m2/repository/.cache/maven-download-plugin || true
@@ -118,4 +110,4 @@ after_failure:
- cat livy/target/tmp/livy-int-test/*/output.log
- ls -R livy/target/tmp/livy-int-test/MiniYarnMain/target/com.cloudera.livy.test.framework.MiniYarnMain/*
- cat livy/target/tmp/livy-int-test/MiniYarnMain/target/com.cloudera.livy.test.framework.MiniYarnMain/*/*/*/stdout
- - cat livy/target/tmp/livy-int-test/MiniYarnMain/target/com.cloudera.livy.test.framework.MiniYarnMain/*/*/*/stderr
+ - cat livy/target/tmp/livy-int-test/MiniYarnMain/target/com.cloudera.livy.test.framework.MiniYarnMain/*/*/*/stderr
\ No newline at end of file