diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index f024d7347..9ecf71f56 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -217,7 +217,22 @@ jobs: run: > "${WIX}/bin/light.exe" -b dist/win/ dist/win/bundle/bundleWithWinfsp.wixobj -ext WixBalExtension - -out installer/Cryptomator.exe + -out installer/unsigned/Cryptomator.exe + - name: Detach burn engine in preparation to sign + run: > + "${WIX}/bin/insignia.exe" -ib .\installer\unsigned\Cryptomator.exe -o .\tmp\engine.exe + - name: Codesign burn engine + uses: skymatic/code-sign-action@v1 + with: + certificate: ${{ secrets.WIN_CODESIGN_P12_BASE64 }} + password: ${{ secrets.WIN_CODESIGN_P12_PW }} + certificatesha1: FF52240075AD7D14AF25629FDF69635357C7D14B + description: Wix Burn Engine + timestampUrl: 'http://timestamp.digicert.com' + folder: tmp + - name: Reattach signed burn engine to installer + run : > + ${WIX}/bin/insignia.exe" -ab tmp\engine.exe installer\unsigned\Cryptomator.exe -o installer\Cryptomator.exe - name: Codesign EXE uses: skymatic/code-sign-action@v1 with: diff --git a/.gitignore b/.gitignore index 8e239b35e..5c84c0dfb 100644 --- a/.gitignore +++ b/.gitignore @@ -21,7 +21,6 @@ pom.xml.versionsBackup .idea/dictionaries/** !.idea/dictionaries/dict_* .idea/compiler.xml -.idea/encodings.xml .idea/jarRepositories.xml .idea/uiDesigner.xml .idea/**/libraries/ diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 000000000..c2bae49d7 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 469ab6398..6b70b6aba 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 17.0.2 3.12.0 - 3.18.3 + 3.19.0 2.2 31.0-jre 2.40.3