From b2b6e304edfdc1fb25d6c3a13b3fea6c388f7666 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Tue, 12 Nov 2019 13:13:58 +0100 Subject: [PATCH 1/3] updated CI config --- .travis.yml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index d0ae3c3c7..0f1a0d9a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -dist: xenial +dist: bionic language: java sudo: false jdk: @@ -17,24 +17,25 @@ addons: - haveged install: - curl -o $HOME/.m2/settings.xml https://gist.githubusercontent.com/cryptobot/cf5fbd909c4782aaeeeb7c7f4a1a43da/raw/e60ee486e34ee0c79f89f947abe2c83b4290c6bb/settings.xml -- mvn -fmain/pom.xml clean install -DskipTests org.codehaus.mojo:versions-maven-plugin:help dependency:go-offline -Pcoverage,release # "clean install" needed until we can exclude artifacts currently in the reactor, see https://maven.apache.org/plugins/maven-dependency-plugin/go-offline-mojo.html#excludeReactor and https://issues.apache.org/jira/browse/MDEP-568 -script: -- mvn --update-snapshots -fmain/pom.xml clean test verify -Pcoverage -after_success: -- curl -o ~/codacy-coverage-reporter.jar https://oss.sonatype.org/service/local/repositories/releases/content/com/codacy/codacy-coverage-reporter/4.0.2/codacy-coverage-reporter-4.0.2-assembly.jar -- $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter.jar report -l Java -r main/commons/target/site/jacoco/jacoco.xml --partial -- $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter.jar report -l Java -r main/keychain/target/site/jacoco/jacoco.xml --partial -- $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter.jar report -l Java -r main/ui/target/site/jacoco/jacoco.xml --partial -- $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter.jar report -l Java -r main/launcher/target/site/jacoco/jacoco.xml --partial -- $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter.jar final -before_deploy: +- mvn -fmain/pom.xml clean install -DskipTests -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN org.codehaus.mojo:versions-maven-plugin:help dependency:go-offline -Pcoverage,release # "clean install" needed until we can exclude artifacts currently in the reactor, see https://maven.apache.org/plugins/maven-dependency-plugin/go-offline-mojo.html#excludeReactor and https://issues.apache.org/jira/browse/MDEP-568 +before_script: - | if [[ -n "$TRAVIS_TAG" ]]; then mvn -fmain/pom.xml org.codehaus.mojo:versions-maven-plugin:set -DnewVersion=$TRAVIS_TAG elif [[ $TRAVIS_BRANCH == "develop" ]] && [[ $TRAVIS_PULL_REQUEST == "false" ]]; then mvn -fmain/pom.xml org.codehaus.mojo:versions-maven-plugin:set -DnewVersion=SNAPSHOT-$(echo $TRAVIS_COMMIT | head -c7) fi -- mvn -fmain/pom.xml clean package -Prelease -DskipTests +script: +- mvn --update-snapshots -fmain/pom.xml clean test verify -Pcoverage +after_success: +- curl -o ~/codacy-coverage-reporter.jar https://oss.sonatype.org/service/local/repositories/releases/content/com/codacy/codacy-coverage-reporter/6.0.7/codacy-coverage-reporter-6.0.7-assembly.jar +- $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter.jar report -l Java -r main/commons/target/site/jacoco/jacoco.xml --partial +- $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter.jar report -l Java -r main/keychain/target/site/jacoco/jacoco.xml --partial +- $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter.jar report -l Java -r main/ui/target/site/jacoco/jacoco.xml --partial +- $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter.jar report -l Java -r main/launcher/target/site/jacoco/jacoco.xml --partial +- $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter.jar final +before_deploy: +- mvn -fmain/pom.xml package -Prelease -DskipTests - export TODAY=`date +'%Y-%m-%d'`; envsubst '$TRAVIS_TAG $TODAY' < .travis-deploy-release.tmpl.json > .travis-deploy-release.json deploy: - provider: bintray # SNAPSHOTS From 638b731cf88aa7eaf22a8efdd62bd81757c424dc Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Tue, 12 Nov 2019 13:23:05 +0100 Subject: [PATCH 2/3] always set version to SNAPSHOT-{commit} for untagged CI builds --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0f1a0d9a6..b4dd8c8cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ before_script: - | if [[ -n "$TRAVIS_TAG" ]]; then mvn -fmain/pom.xml org.codehaus.mojo:versions-maven-plugin:set -DnewVersion=$TRAVIS_TAG - elif [[ $TRAVIS_BRANCH == "develop" ]] && [[ $TRAVIS_PULL_REQUEST == "false" ]]; then + else mvn -fmain/pom.xml org.codehaus.mojo:versions-maven-plugin:set -DnewVersion=SNAPSHOT-$(echo $TRAVIS_COMMIT | head -c7) fi script: From c8059bef78e835eb35eb3770d85aed1fb6db5826 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Tue, 12 Nov 2019 13:32:51 +0100 Subject: [PATCH 3/3] bumped version [ci skip] --- main/buildkit/pom.xml | 2 +- main/commons/pom.xml | 2 +- main/keychain/pom.xml | 2 +- main/launcher/pom.xml | 2 +- main/pom.xml | 2 +- main/ui/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/main/buildkit/pom.xml b/main/buildkit/pom.xml index b4dddb8b0..11ad987bd 100644 --- a/main/buildkit/pom.xml +++ b/main/buildkit/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-SNAPSHOT + 1.5.0-beta1 buildkit pom diff --git a/main/commons/pom.xml b/main/commons/pom.xml index 261ab2ee8..1f9b121ec 100644 --- a/main/commons/pom.xml +++ b/main/commons/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-SNAPSHOT + 1.5.0-beta1 commons Cryptomator Commons diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml index 4b454f8be..441e75af8 100644 --- a/main/keychain/pom.xml +++ b/main/keychain/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-SNAPSHOT + 1.5.0-beta1 keychain System Keychain Access diff --git a/main/launcher/pom.xml b/main/launcher/pom.xml index aef980622..a56cd33c6 100644 --- a/main/launcher/pom.xml +++ b/main/launcher/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-SNAPSHOT + 1.5.0-beta1 launcher Cryptomator Launcher diff --git a/main/pom.xml b/main/pom.xml index 5ab371fb3..026092229 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.cryptomator main - 1.5.0-SNAPSHOT + 1.5.0-beta1 pom Cryptomator diff --git a/main/ui/pom.xml b/main/ui/pom.xml index 1c37e76d5..e2c17e375 100644 --- a/main/ui/pom.xml +++ b/main/ui/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-SNAPSHOT + 1.5.0-beta1 ui Cryptomator GUI