From b3c65267dfe94f0fed5df502d017e99bf455b4e9 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Tue, 15 Dec 2015 20:32:55 +0100 Subject: [PATCH 1/6] added test coverage build plugin --- .travis.yml | 13 ++++++++++++- main/core/pom.xml | 9 +++++++++ main/crypto-aes/pom.xml | 9 +++++++++ main/crypto-api/pom.xml | 11 ++++++++++- main/pom.xml | 21 +++++++++++++++++++++ 5 files changed, 61 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 690440261..395024557 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,18 @@ language: java + jdk: - oraclejdk8 + +env: + global: + - secure: "Lgj042RD0X3rB8VZVZLWP1GetLhjd3PqI5JbJMlzgHJpDI6RkFIBLN9SWAGmkLPCehIp2zA5tu9+UVy0NNMxm9xz6SyjMCaxS28/fnYEXaNmwwDSF6O6gLUbdxyzoYIFPYOPmFxpzhebqnNIsxaM29oZpgRgUGqosCczQxiB+Ng=" + before_install: "curl -L --cookie 'oraclelicense=accept-securebackup-cookie;' http://download.oracle.com/otn-pub/java/jce/8/jce_policy-8.zip -o /tmp/policy.zip && sudo unzip -j -o /tmp/policy.zip *.jar -d `jdk_switcher home oraclejdk8`/jre/lib/security && rm /tmp/policy.zip" + script: mvn -fmain/pom.xml -Puber-jar clean package + +after_success: mvn clean test jacoco:report coveralls:report + notifications: webhooks: urls: @@ -10,11 +20,12 @@ notifications: on_success: change on_failure: always on_start: false + deploy: provider: releases prerelease: true api_key: - secure: ZjE1j93v3qbPIe2YbmhS319aCbMdLQw0HuymmluTurxXsZtn9D4t2+eTr99vBVxGRuB5lzzGezPR5zjk5W7iHF7xhwrawXrFzr2rPJWzWFt0aM+Ry2njU1ROTGGXGTbv4anWeBlgMxLEInTAy/9ytOGNJlec83yc0THpOY2wxnk= + secure: "ZjE1j93v3qbPIe2YbmhS319aCbMdLQw0HuymmluTurxXsZtn9D4t2+eTr99vBVxGRuB5lzzGezPR5zjk5W7iHF7xhwrawXrFzr2rPJWzWFt0aM+Ry2njU1ROTGGXGTbv4anWeBlgMxLEInTAy/9ytOGNJlec83yc0THpOY2wxnk=" file: main/uber-jar/target/Cryptomator-$TRAVIS_TAG.jar skip_cleanup: true on: diff --git a/main/core/pom.xml b/main/core/pom.xml index 5d55b77b5..fe3fc22d3 100644 --- a/main/core/pom.xml +++ b/main/core/pom.xml @@ -74,4 +74,13 @@ jackson-databind + + + + + org.jacoco + jacoco-maven-plugin + + + diff --git a/main/crypto-aes/pom.xml b/main/crypto-aes/pom.xml index eec989feb..3329405b5 100644 --- a/main/crypto-aes/pom.xml +++ b/main/crypto-aes/pom.xml @@ -77,4 +77,13 @@ provided + + + + + org.jacoco + jacoco-maven-plugin + + + diff --git a/main/crypto-api/pom.xml b/main/crypto-api/pom.xml index 9ef2f03c9..52889fc93 100644 --- a/main/crypto-api/pom.xml +++ b/main/crypto-api/pom.xml @@ -32,4 +32,13 @@ commons-collections4 - \ No newline at end of file + + + + + org.jacoco + jacoco-maven-plugin + + + + diff --git a/main/pom.xml b/main/pom.xml index f0dddf885..e8ac2a512 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -256,6 +256,19 @@ + + org.jacoco + jacoco-maven-plugin + 0.7.5.201505241946 + + + prepare-agent + + prepare-agent + + + + @@ -268,6 +281,14 @@ 1.8 + + org.eluder.coveralls + coveralls-maven-plugin + 4.0.0 + + ${env.COVERALLS_REPO_TOKEN} + + From de29c84a0c9dce0659a160f10b0069700c45b42a Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Tue, 15 Dec 2015 20:39:10 +0100 Subject: [PATCH 2/6] fixed code coverage job config --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 395024557..1c87fcb3c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ before_install: "curl -L --cookie 'oraclelicense=accept-securebackup-cookie;' h script: mvn -fmain/pom.xml -Puber-jar clean package -after_success: mvn clean test jacoco:report coveralls:report +after_success: mvn -fmain/pom.xml clean test jacoco:report coveralls:report notifications: webhooks: From e11b0a34210b23dbe52160e1f8a3ae31d86b0da1 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Tue, 15 Dec 2015 20:48:12 +0100 Subject: [PATCH 3/6] trying to speed up build --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1c87fcb3c..c09a02448 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,9 +9,9 @@ env: before_install: "curl -L --cookie 'oraclelicense=accept-securebackup-cookie;' http://download.oracle.com/otn-pub/java/jce/8/jce_policy-8.zip -o /tmp/policy.zip && sudo unzip -j -o /tmp/policy.zip *.jar -d `jdk_switcher home oraclejdk8`/jre/lib/security && rm /tmp/policy.zip" -script: mvn -fmain/pom.xml -Puber-jar clean package +script: mvn -fmain/pom.xml -Puber-jar clean test package jacoco:report -after_success: mvn -fmain/pom.xml clean test jacoco:report coveralls:report +after_success: mvn -fmain/pom.xml coveralls:report notifications: webhooks: From b2cb5d1dac36466875946d7f9ed130d25a0c14ce Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Tue, 15 Dec 2015 20:54:26 +0100 Subject: [PATCH 4/6] trying to speed up build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c09a02448..c5062808a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ env: before_install: "curl -L --cookie 'oraclelicense=accept-securebackup-cookie;' http://download.oracle.com/otn-pub/java/jce/8/jce_policy-8.zip -o /tmp/policy.zip && sudo unzip -j -o /tmp/policy.zip *.jar -d `jdk_switcher home oraclejdk8`/jre/lib/security && rm /tmp/policy.zip" -script: mvn -fmain/pom.xml -Puber-jar clean test package jacoco:report +script: mvn -fmain/pom.xml -Puber-jar clean test jacoco:report package after_success: mvn -fmain/pom.xml coveralls:report From e4955ea6c8abcf80dc37e49e829f2c64e2c9ef69 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Tue, 15 Dec 2015 21:14:56 +0100 Subject: [PATCH 5/6] still trying to speed up build building uber-jar only when deploying --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c5062808a..8fb86ee5f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ env: before_install: "curl -L --cookie 'oraclelicense=accept-securebackup-cookie;' http://download.oracle.com/otn-pub/java/jce/8/jce_policy-8.zip -o /tmp/policy.zip && sudo unzip -j -o /tmp/policy.zip *.jar -d `jdk_switcher home oraclejdk8`/jre/lib/security && rm /tmp/policy.zip" -script: mvn -fmain/pom.xml -Puber-jar clean test jacoco:report package +script: mvn -fmain/pom.xml clean test jacoco:report after_success: mvn -fmain/pom.xml coveralls:report @@ -21,6 +21,8 @@ notifications: on_failure: always on_start: false +before_deploy: mvn -fmain/pom.xml -Puber-jar clean package -DskipTests + deploy: provider: releases prerelease: true From 044532ef1524fd2d2cf633de133332e0cb4b2472 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Tue, 15 Dec 2015 21:25:55 +0100 Subject: [PATCH 6/6] reverted to original coveralls snippet --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8fb86ee5f..c4e3212cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,9 +9,9 @@ env: before_install: "curl -L --cookie 'oraclelicense=accept-securebackup-cookie;' http://download.oracle.com/otn-pub/java/jce/8/jce_policy-8.zip -o /tmp/policy.zip && sudo unzip -j -o /tmp/policy.zip *.jar -d `jdk_switcher home oraclejdk8`/jre/lib/security && rm /tmp/policy.zip" -script: mvn -fmain/pom.xml clean test jacoco:report +script: mvn -fmain/pom.xml clean test -after_success: mvn -fmain/pom.xml coveralls:report +after_success: mvn -fmain/pom.xml clean test jacoco:report coveralls:report notifications: webhooks: