From 1f09a3fa3abcf1ff1e94ddd9d591dd3a8e56c929 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Tue, 1 Aug 2023 10:04:07 +0200 Subject: [PATCH 1/4] allow notarization on manually dispatched builds --- .github/workflows/mac-dmg.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index 1b3b4f0b9..764af2d9a 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -8,6 +8,11 @@ on: version: description: 'Version' required: false + notarize: + description: 'Notarize' + required: true + default: false + type: boolean env: JAVA_VERSION: 20 @@ -222,7 +227,7 @@ jobs: env: VERSION_NO: ${{ needs.get-version.outputs.semVerNum }} - name: Notarize .dmg - if: startsWith(github.ref, 'refs/tags/') + if: startsWith(github.ref, 'refs/tags/') || inputs.notarize uses: cocoalibs/xcode-notarization-action@v1 with: app-path: 'Cryptomator-*.dmg' From f4ad7aa43dd36c23a3573bc120e21337753d98f0 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 1 Aug 2023 16:29:36 +0200 Subject: [PATCH 2/4] References #3045 Use different encoding reading process output --- .../OneDriveWindowsLocationPresetsProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/cryptomator/common/locationpresets/OneDriveWindowsLocationPresetsProvider.java b/src/main/java/org/cryptomator/common/locationpresets/OneDriveWindowsLocationPresetsProvider.java index 7dcfde239..1d5bffd70 100644 --- a/src/main/java/org/cryptomator/common/locationpresets/OneDriveWindowsLocationPresetsProvider.java +++ b/src/main/java/org/cryptomator/common/locationpresets/OneDriveWindowsLocationPresetsProvider.java @@ -83,8 +83,8 @@ public final class OneDriveWindowsLocationPresetsProvider implements LocationPre throw new TimeoutException(cmdDescription + " timed out after " + timeoutSeconds + "s"); } if (process.exitValue() != 0) { - @SuppressWarnings("resource") var stdout = process.inputReader(StandardCharsets.UTF_8).lines().collect(Collectors.joining("\n")); - @SuppressWarnings("resource") var stderr = process.errorReader(StandardCharsets.UTF_8).lines().collect(Collectors.joining("\n")); + @SuppressWarnings("resource") var stdout = process.inputReader(StandardCharsets.ISO_8859_1).lines().collect(Collectors.joining("\n")); + @SuppressWarnings("resource") var stderr = process.errorReader(StandardCharsets.ISO_8859_1).lines().collect(Collectors.joining("\n")); throw new CommandFailedException(cmdDescription, process.exitValue(), stdout, stderr); } } From 7f0c92e2f09c4fa62d72ea3e9b0543bd18462f94 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 2 Aug 2023 09:44:18 +0200 Subject: [PATCH 3/4] Bump integrations-linux to 1.3.0-beta6 Fixes #3020 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f1f42b093..ff2f1c218 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ 1.3.0 1.2.0 1.2.0 - 1.3.0-beta5 + 1.3.0-beta6 3.0.0 2.0.0 2.0.3 From d08d992768b669006bff4c8fb5e416923745a1c8 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 2 Aug 2023 09:44:31 +0200 Subject: [PATCH 4/4] Bump integrations-win to 1.2.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ff2f1c218..871611ea0 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 2.6.6 1.3.0 - 1.2.0 + 1.2.2 1.2.0 1.3.0-beta6 3.0.0