fix: use default openssl for windows runners

unxsist · Apr 24, 2024 · 3a2662f · 3a2662f
1 parent 3675bfe
commit 3a2662f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 23 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -48,14 +48,13 @@ jobs:
           sudo apt-get update || true
           sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
 
-      - name: Install OpenSSL
+      - name: Set-up OpenSSL (Windows Only)
         if: matrix.platform == 'windows-latest'
         run: |
-          choco install openssl --execution-timeout 7200
           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
-          copy "C:\Program Files\OpenSSL\bin\libssl-3-x64.dll" .\src-tauri
+          copy "C:\Program Files\OpenSSL\bin\libcrypto-1_1-x64.dll" .\src-tauri
+          copy "C:\Program Files\OpenSSL\bin\libssl-1_1-x64.dll" .\src-tauri
 
       - name: Set Windows Env Vars
         if: matrix.platform == 'windows-latest'

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -40,14 +40,13 @@ jobs:
           sudo apt-get update || true
           sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
 
-      - name: Install OpenSSL (Windows only)
+      - name: Set-up OpenSSL (Windows only)
         if: matrix.settings.platform == 'windows-latest'
         run: |
-          choco install openssl --execution-timeout 7200
           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
-          copy "C:\Program Files\OpenSSL\bin\libssl-3-x64.dll" .\src-tauri
+          copy "C:\Program Files\OpenSSL\bin\libcrypto-1_1-x64.dll" .\src-tauri
+          copy "C:\Program Files\OpenSSL\bin\libssl-1_1-x64.dll" .\src-tauri
 
       - name: install Rust stable
         uses: dtolnay/rust-toolchain@stable

diff --git a/src-tauri/tauri.windows.conf.json b/src-tauri/tauri.windows.conf.json
@@ -1,16 +1,13 @@
 {
-    "tauri": {
-        "bundle": {
-            "resources": [
-                "libcrypto-3-x64.dll",
-                "libssl-3-x64.dll"
-            ]
-        },
-        "windows": [
-            {
-              "title": "JET Pilot",
-              "decorations": false
-            }
-        ]
-    }
-}
+  "tauri": {
+    "bundle": {
+      "resources": ["libcrypto-1_1-x64.dll", "libssl-1_1-x64.dll"]
+    },
+    "windows": [
+      {
+        "title": "JET Pilot",
+        "decorations": false
+      }
+    ]
+  }
+}