👷add more archs

bepass-org · May 28, 2024 · ba85a0f · ba85a0f
1 parent 3e2a6e8
commit ba85a0f
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 22 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -13,7 +13,7 @@ jobs:
 
         strategy:
             matrix:
-                os: [windows-latest, macos-latest]
+                os: [windows-latest, macos-latest, ubuntu-latest]
                 # os: [ubuntu-latest, windows-latest, macos-latest]
 
         steps:

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -217,8 +217,22 @@
         },
         "win": {
             "target": [
-                "nsis",
-                "zip"
+                {
+                    "target": "nsis",
+                    "arch": [
+                        "x64",
+                        "arm64",
+                        "ia32"
+                    ]
+                },
+                {
+                    "target": "zip",
+                    "arch": [
+                        "x64",
+                        "arm64",
+                        "ia32"
+                    ]
+                }
             ]
         },
         "nsis": {
@@ -228,10 +242,8 @@
         },
         "linux": {
             "target": [
-                "rpm",
-                "tar.xz",
                 {
-                    "target": "deb",
+                    "target": "tar.xz",
                     "arch": [
                         "arm64",
                         "x64"

diff --git a/release/app/package-lock.json b/release/app/package-lock.json
diff --git a/script/dlWp.ts b/script/dlWp.ts
@@ -94,24 +94,21 @@ const dlUnzipMove = async (url: string) => {
         });
 };
 
-const baseUrl = `https://github.com/bepass-org/warp-plus/releases/download/${wpVersion}`;
+const baseUrl = `https://github.com/bepass-org/warp-plus/releases/download/${wpVersion}/warp-plus_`;
 
 const urls: any = {
     linux: {
-        x64: baseUrl + '/warp-plus_linux-amd64.zip',
-        arm64: baseUrl + '/warp-plus_linux-arm64.zip'
+        x64: baseUrl + 'linux-amd64.zip',
+        arm64: baseUrl + 'linux-arm64.zip'
     },
     win32: {
-        x64: baseUrl + '/warp-plus_windows-amd64.zip',
-        arm64: baseUrl + '/warp-plus_windows-arm64.zip'
+        x64: baseUrl + 'windows-amd64.zip',
+        arm64: baseUrl + 'windows-arm64.zip',
+        ia32: baseUrl + 'windows-386.zip'
     },
     darwin: {
-        x64: baseUrl + '/warp-plus_darwin-amd64.zip',
-        arm64: baseUrl + '/warp-plus_darwin-arm64.zip'
-    },
-    mas: {
-        x64: baseUrl + '/warp-plus_darwin-amd64.zip',
-        arm64: baseUrl + '/warp-plus_darwin-arm64.zip'
+        x64: baseUrl + 'darwin-amd64.zip',
+        arm64: baseUrl + 'darwin-arm64.zip'
     }
 };
 
@@ -123,10 +120,10 @@ switch (platform) {
     case 'linux':
     case 'win32':
     case 'darwin':
-    case 'mas': // mac universal
         switch (arch) {
             case 'x64':
             case 'arm64':
+            case 'ia32':
                 dlUnzipMove(urls[platform][arch]);
                 break;