From f47e7cd3927ab8bd0d9d6d852eff7bc21771f7c2 Mon Sep 17 00:00:00 2001
From: Jaifroid <egk10@cam.ac.uk>
Date: Sat, 14 Jan 2023 11:15:31 +0000
Subject: [PATCH] Remove incompatible build types and add them as custom build
 option

---
 .github/workflows/build-electron.yml |  4 ++--
 package.json                         | 11 +++--------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build-electron.yml b/.github/workflows/build-electron.yml
index c0cfe012..d15d5c90 100644
--- a/.github/workflows/build-electron.yml
+++ b/.github/workflows/build-electron.yml
@@ -59,13 +59,13 @@ jobs:
           exit 1
         fi
     - name: Build and publish 64bit
-      run: npm run dist-linux64
+      run: npm run publish
     - name: Build and pulblish 32bit
       run: |
         echo "Changing Electron version to latest that supports 32bit Linux (18.3.15)"
         sed -i -E 's/("electron":\s")[^"]+/\118.3.15/' ./package.json
         npm install --save-dev
-        npx run dist-linux32
+        npx electron-builder --linux AppImage:ia32 deb:ia32 rpm:ia32
     - name: Upload packages to Kiwix
       run: |
         echo "$SSH_KEY" > ./scripts/ssh_key
diff --git a/package.json b/package.json
index 2bb46bee..afae1f27 100644
--- a/package.json
+++ b/package.json
@@ -45,22 +45,19 @@
         {
           "target": "AppImage",
           "arch": [
-            "x64",
-            "ia32"
+            "x64"
           ]
         },
         {
           "target": "deb",
           "arch": [
-            "x64",
-            "ia32"
+            "x64"
           ]
         },
         {
           "target": "rpm",
           "arch": [
-            "x64",
-            "ia32"
+            "x64"
           ]
         }
       ],
@@ -86,8 +83,6 @@
     "start": "electron .",
     "dist-win": "electron-builder build --win",
     "dist-linux": "electron-builder build --linux",
-    "dist-linux32": "electron-builder build --linux --ia32",
-    "dist-linux64": "electron-builder build --linux --x64",
     "publish": "electron-builder",
     "package-mac": "electron-packager . kiwix-js-windows --overwrite --platform=darwin --arch=x64 --icon=assets/icons/mac/icon.icns --prune=true --out=release-builds",
     "package-win": "electron-packager . kiwix-js-windows --overwrite --electron-version='18.3.14' --ignore=archives --ignore=AppPackages --ignore=BundleArtifacts --ignore=images$ --ignore=bin$ --ignore=electron_icons$ --ignore=manifests$ --ignore=screenshots$ --ignore=scripts$  --ignore=bld$ --ignore=KiwixWebApp.* --ignore=[pP]ackage.[aSl] --ignore=[.]git[hi][ug][bn] --ignore=[.]vs$ --ignore=vscode --platform=win32 --arch=ia32 --icon=www/img/icons/kiwix-64.ico --prune=true --out=bld/electron --version-string.CompanyName=Kiwix --version-string.FileDescription='Kiwix JS ZIM File Reader' --version-string.ProductName='Kiwix JS Windows Electron Edition'",