From be5d38200580e37f115ec05ff13fedabc176bbaa Mon Sep 17 00:00:00 2001 From: Jeroen Nijhuis Date: Fri, 22 Dec 2023 12:38:48 +0100 Subject: [PATCH] fix(windows): currectly include openssl dll files --- .github/workflows/release.yml | 4 ++-- src-tauri/resources/.gitkeep | 0 src-tauri/tauri.conf.json | 3 --- src-tauri/tauri.windows.conf.json | 9 +++++++++ 4 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 src-tauri/resources/.gitkeep create mode 100644 src-tauri/tauri.windows.conf.json diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 66c24c2..31db495 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -46,8 +46,8 @@ jobs: choco install openssl mkdir -p "C:\Program Files\OpenSSL\ca" curl -o "C:\Program Files\OpenSSL\ca\cacert.pem" https://curl.se/ca/cacert.pem - copy "C:\Program Files\OpenSSL\bin\libcrypto-3-x64.dll" .\src-tauri\resources - copy "C:\Program Files\OpenSSL\bin\libssl-3-x64.dll" .\src-tauri\resources + copy "C:\Program Files\OpenSSL\bin\libcrypto-3-x64.dll" .\src-tauri + copy "C:\Program Files\OpenSSL\bin\libssl-3-x64.dll" .\src-tauri - name: Build Vite + Tauri (MacOS + Linux) if: matrix.platform != 'windows-latest' diff --git a/src-tauri/resources/.gitkeep b/src-tauri/resources/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 853085e..f32c8bd 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -36,9 +36,6 @@ "icons/128x128@2x.png", "icons/icon.icns", "icons/icon.ico" - ], - "resources": [ - "resources/*" ] }, "windows": [ diff --git a/src-tauri/tauri.windows.conf.json b/src-tauri/tauri.windows.conf.json new file mode 100644 index 0000000..ad32e6b --- /dev/null +++ b/src-tauri/tauri.windows.conf.json @@ -0,0 +1,9 @@ +{ + "tauri": { + "bundle": { + "resources": [ + "*.dll" + ] + } + } +} \ No newline at end of file