[struts] branch master updated (3bf9546 -> 3ff6fd8)

2018-11-22 Thread yasserzamani
This is an automated email from the ASF dual-hosted git repository.

yasserzamani pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git.


from 3bf9546  Merge pull request #279 from sepe81/update-persistence-api
 add 352f509  Enhance after_success for Travis CI
 new 3ff6fd8  Merge pull request #280 from sepe81/travis-after_success

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .travis.yml | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)



[struts] 01/01: Merge pull request #280 from sepe81/travis-after_success

2018-11-22 Thread yasserzamani
This is an automated email from the ASF dual-hosted git repository.

yasserzamani pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 3ff6fd8f49fb9d1b23ebaf08d3080355a5d17633
Merge: 3bf9546 352f509
Author: Yasser Zamani 
AuthorDate: Thu Nov 22 14:15:56 2018 +0330

Merge pull request #280 from sepe81/travis-after_success

Enhance after_success for Travis CI

 .travis.yml | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)



[struts] branch struts-2-5-x updated: Enhance after_success for Travis CI

2018-11-22 Thread yasserzamani
This is an automated email from the ASF dual-hosted git repository.

yasserzamani pushed a commit to branch struts-2-5-x
in repository https://gitbox.apache.org/repos/asf/struts.git


The following commit(s) were added to refs/heads/struts-2-5-x by this push:
 new 3609279  Enhance after_success for Travis CI
3609279 is described below

commit 360927931ca3d2497dd5560165741236a3261935
Author: Sebastian Peters 
AuthorDate: Thu Nov 22 01:21:45 2018 +0330

Enhance after_success for Travis CI

Use default bash if-then-else block with semicolon after each command
and fix spelling for "incompatibility".

Don't do `mvn clean` b/c we need the test results for the following
tasks and don't need to rebuild everything.

(cherry picked from commit 352f509)
---
 .travis.yml | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e12ba2f..38e83f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,9 +12,10 @@ script: mvn test -DskipAssembly
 
 after_success:
   # TODO delete following if statement after fix of 
https://github.com/cobertura/cobertura/issues/271
-  - if [ "$TRAVIS_JDK_VERSION" == "openjdk8" ] || [ "$TRAVIS_JDK_VERSION" == 
"oraclejdk8" ];
-  then mvn clean cobertura:cobertura 
org.eluder.coveralls:coveralls-maven-plugin:report 
com.updateimpact:updateimpact-maven-plugin:submit 
-Ptravis-coveralls,update-impact -DskipAssembly;
-  else echo "Not reporting coverage for $TRAVIS_JDK_VERSION due to 
incomatibility or to save performance";
+  - if [ "$TRAVIS_JDK_VERSION" == "openjdk8" ] || [ "$TRAVIS_JDK_VERSION" == 
"oraclejdk8" ]; then
+  mvn cobertura:cobertura 
org.eluder.coveralls:coveralls-maven-plugin:report 
com.updateimpact:updateimpact-maven-plugin:submit 
-Ptravis-coveralls,update-impact -DskipAssembly;
+else
+  echo "Not reporting coverage for $TRAVIS_JDK_VERSION due to 
incompatibility or to save performance";
 fi;
 
 env: