From 262ebc5fed183298550de7b6691eb52e56da40b5 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Fri, 4 Oct 2019 21:55:47 +0200 Subject: [PATCH 1/5] Add UUID for upgrading In my understanding generating two installers with different versions and same --win-upgrade-uuid should uninstall another version during installation, i.e. this is needed to have a proper upgrade instead of a parallel installation of two JabRef versions. --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 2a95dc4d428..10b9632072a 100644 --- a/build.gradle +++ b/build.gradle @@ -582,6 +582,7 @@ jlink { installerOptions = [ '--vendor', 'JabRef', '--app-version', "${project.version}", + '--win-upgrade-uuid', 'd636b4ee-6f10-451e-bf57-c89656780e36' '--win-dir-chooser', '--win-shortcut' ] From a53b137dd1111d4fa4c2df75af6a7c6fcb1c8812 Mon Sep 17 00:00:00 2001 From: matthiasgeiger Date: Sat, 5 Oct 2019 10:29:22 +0200 Subject: [PATCH 2/5] add missing ',' --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 10b9632072a..b3d7851f76a 100644 --- a/build.gradle +++ b/build.gradle @@ -582,7 +582,7 @@ jlink { installerOptions = [ '--vendor', 'JabRef', '--app-version', "${project.version}", - '--win-upgrade-uuid', 'd636b4ee-6f10-451e-bf57-c89656780e36' + '--win-upgrade-uuid', 'd636b4ee-6f10-451e-bf57-c89656780e36', '--win-dir-chooser', '--win-shortcut' ] From baa47ff95f13764f6ecb9f9ab38762f56752c342 Mon Sep 17 00:00:00 2001 From: matthiasgeiger Date: Sat, 5 Oct 2019 11:22:39 +0200 Subject: [PATCH 3/5] use submodules to fetch CSL styles properly --- .github/workflows/deployment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index 2e3f869b953..7181f896579 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -33,6 +33,7 @@ jobs: uses: actions/checkout@v1 with: fetch-depth: 1 + submodules: true - name: Set up JDK uses: actions/setup-java@v1 with: From bbab95021364be54ed21e678fcf89ee9d1529766 Mon Sep 17 00:00:00 2001 From: matthiasgeiger Date: Sat, 5 Oct 2019 11:36:19 +0200 Subject: [PATCH 4/5] revert 3fbe0a2b57340f03d7d1271eeeb30a061d724134 --- .github/workflows/deployment.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index 7181f896579..2889d2e2cac 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -32,7 +32,6 @@ jobs: - name: Checkout source uses: actions/checkout@v1 with: - fetch-depth: 1 submodules: true - name: Set up JDK uses: actions/setup-java@v1 From d3fd6f930db846c04339c12eaa77907c8d1f082b Mon Sep 17 00:00:00 2001 From: Christoph Date: Sat, 5 Oct 2019 18:09:51 +0200 Subject: [PATCH 5/5] Update deployment.yml Readd depth --- .github/workflows/deployment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index 2889d2e2cac..bec5380f3d1 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -32,6 +32,7 @@ jobs: - name: Checkout source uses: actions/checkout@v1 with: + depth: 1 submodules: true - name: Set up JDK uses: actions/setup-java@v1