Merge pull request #18 from LorenzoBettini/travis

Travis
LorenzoBettini · Jan 2, 2018 · f5d3058 · f5d3058
2 parents c980812 + 888fb55
commit f5d3058
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,12 +5,14 @@ language: java
 matrix:
   fast_finish: true
   include:
+    # always build this environment
     - os: linux
       jdk: oraclejdk8
-      env: DISPLAY=:99.0
-#    - os: osx
-#      osx_image: xcode8
-
+      env: DISPLAY=:99.0 ADDITIONAL="-Pjacoco coveralls:report"
+    # only on PR
+    # - os: osx
+    #  osx_image: xcode8
+    #  if: type IN (pull_request)
 cache:
   directories:
   - $HOME/.m2

diff --git a/edelta.parent/edelta.tests.parent/pom.xml b/edelta.parent/edelta.tests.parent/pom.xml
@@ -10,7 +10,7 @@
 	<packaging>pom</packaging>
 
 	<properties>
-		<jacoco-version>0.7.8</jacoco-version>
+		<jacoco-version>0.7.9</jacoco-version>
 		<os-jvm-flags />
 	</properties>
 

diff --git a/travis_build.sh b/travis_build.sh
@@ -10,5 +10,5 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then
 	fi
 else
 	echo "Build on Linux"
-	mvn -f edelta.parent/pom.xml clean verify -Pjacoco coveralls:report -Dtycho.disableP2Mirrors=true
+	mvn -f edelta.parent/pom.xml clean verify $ADDITIONAL
 fi