From 002935af604602516cff844bc941f3c20348097a Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Tue, 21 Apr 2020 13:49:37 +0200 Subject: [PATCH 1/2] preparing 1.5.1 --- 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 c86927d33..b29cb977d 100644 --- a/main/buildkit/pom.xml +++ b/main/buildkit/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.6.0-SNAPSHOT + 1.5.1 buildkit pom diff --git a/main/commons/pom.xml b/main/commons/pom.xml index 54e711559..fd6b0aea0 100644 --- a/main/commons/pom.xml +++ b/main/commons/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.6.0-SNAPSHOT + 1.5.1 commons Cryptomator Commons diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml index 8e8eb6d23..7b99f1730 100644 --- a/main/keychain/pom.xml +++ b/main/keychain/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.6.0-SNAPSHOT + 1.5.1 keychain System Keychain Access diff --git a/main/launcher/pom.xml b/main/launcher/pom.xml index 21a8f910c..ef3d74d4c 100644 --- a/main/launcher/pom.xml +++ b/main/launcher/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.6.0-SNAPSHOT + 1.5.1 launcher Cryptomator Launcher diff --git a/main/pom.xml b/main/pom.xml index 917d930a3..dbb5c18eb 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.cryptomator main - 1.6.0-SNAPSHOT + 1.5.1 pom Cryptomator diff --git a/main/ui/pom.xml b/main/ui/pom.xml index c27fbb1aa..364d66d62 100644 --- a/main/ui/pom.xml +++ b/main/ui/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.6.0-SNAPSHOT + 1.5.1 ui Cryptomator GUI From a869fc219dff9269e7070fa5a52f77c8349f435b Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Tue, 21 Apr 2020 14:05:36 +0200 Subject: [PATCH 2/2] Use tags, not maven versions --- .github/workflows/build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f3d74d5e4..31b43f7cd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,6 +19,9 @@ jobs: key: ${{ runner.os }}-maven-${{ github.run_id }} restore-keys: | ${{ runner.os }}-maven- + - name: Ensure to use tagged version + run: mvn versions:set --file main/pom.xml -DnewVersion=${GITHUB_REF##*/} # use shell parameter expansion to strip of 'refs/tags' + if: startsWith(github.ref, 'refs/tags/') - name: Build with Maven run: mvn -B install --file main/pom.xml -Pcoverage - name: Run Codacy Coverage Reporter @@ -46,6 +49,9 @@ jobs: with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ github.run_id }} + - name: Ensure to use tagged version + run: mvn versions:set --file main/pom.xml -DnewVersion=${GITHUB_REF##*/} # use shell parameter expansion to strip of 'refs/tags' + if: startsWith(github.ref, 'refs/tags/') - name: Build with Maven run: mvn -B package -DskipTests --file main/pom.xml --resume-from=buildkit -Prelease - name: Upload buildkit-linux.zip