From eff86f62398928bbf9efa27d38a076729501448b Mon Sep 17 00:00:00 2001 From: Alexey Andreev Date: Fri, 26 Oct 2018 16:10:36 +0300 Subject: [PATCH] Less output from Maven. Delete TeaVM artifacts from local repository before caching --- .travis.yml | 13 +++++++------ pom.xml | 3 +++ tools/eclipse/core-plugin/pom.xml | 1 + tools/idea/idea-artifacts/pom.xml | 1 + 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7c85c97e0..febf79b60 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ branches: - /^dev-.+/ before_install: - - export MVN_CMD="mvn -Dmaven.repo.local=$HOME/mvn_repo" + - export MVN_CMD="mvn -Dmaven.repo.local=$HOME/mvn_repo -B" - nvm install 7 - OLD_VERSION=`$MVN_CMD help:evaluate -Dexpression=project.version 2>/dev/null | grep -Ev "(^\[|Download)"` - BASE_VERSION=${OLD_VERSION%-SNAPSHOT} @@ -35,7 +35,7 @@ before_install: - rm -rf $HOME/.m2 install: - - $MVN_CMD install -Dteavm.build.all=false -P with-idea -P with-eclipse -P with-cli -DskipTests=true -Dmaven.javadoc.skip=true -B -V + - $MVN_CMD install -Dteavm.build.all=false -P with-idea -P with-eclipse -P with-cli -DskipTests=true -Dmaven.javadoc.skip=true -V - pushd tests/src/test/js - npm config set prefix=$HOME/.node_modules - npm install @@ -68,8 +68,9 @@ after_success: > export TEAVM_FTP_HOST export TEAVM_FTP_LOGIN export TEAVM_FTP_PASSWORD - $MVN_CMD deploy -Dteavm.build.all=false -DskipTests --settings travis-settings.xml -P deploy-to-bintray -P with-idea && \ - ./upload-files.sh + $MVN_CMD deploy -Dteavm.build.all=false -DskipTests --settings travis-settings.xml \ + -P deploy-to-bintray-P with-idea && \ + ./upload-files.sh fi -after_script: - - rm -rf $HOME/.m2/repository/org/teavm +before_cache: + - rm -rf $HOME/mvn_repo/org/teavm diff --git a/pom.xml b/pom.xml index fec101e6f..0003d6a33 100644 --- a/pom.xml +++ b/pom.xml @@ -227,6 +227,9 @@ jar post-integration-test + + true + diff --git a/tools/eclipse/core-plugin/pom.xml b/tools/eclipse/core-plugin/pom.xml index e4abcb314..8d091de95 100644 --- a/tools/eclipse/core-plugin/pom.xml +++ b/tools/eclipse/core-plugin/pom.xml @@ -49,6 +49,7 @@ clean package -Dmaven.repo.local=${settings.localRepository} + -B diff --git a/tools/idea/idea-artifacts/pom.xml b/tools/idea/idea-artifacts/pom.xml index c8c9189c5..f58f6c92f 100644 --- a/tools/idea/idea-artifacts/pom.xml +++ b/tools/idea/idea-artifacts/pom.xml @@ -59,6 +59,7 @@ -Didea.version=${idea.version} -Dteavm.version=${project.version} -Dmaven.repo.local=${settings.localRepository} + -B