Improve app and add more install options (and fix old .dmg files)

Author: oxmc

.github/workflows/build-and-release.yml

@@ -31,6 +31,9 @@ jobs:
       - name: Install dependencies
         run: npm install
 
+      - name: Build (ia32)
+        run: npm run build -- --arch ia32
+
       - name: Build (x64)
         run: npm run build -- --arch x64
 
@@ -49,6 +52,8 @@ jobs:
       - name: Generate checksum
         run: |
           sha256sum dist/*.AppImage > dist/sha256sum.txt
+          sha256sum dist/*.deb >> dist/sha256sum.txt
+          sha256sum dist/*.zip >> dist/sha256sum.txt
 
       - name: Upload Linux Artifacts
         uses: actions/upload-artifact@v4
@@ -57,14 +62,15 @@ jobs:
           name: linux-artifacts
           path: |
             dist/*.AppImage
+            dist/*.deb
+            dist/*.zip
             dist/latest*.yml
             dist/sha256sum.txt
 
   build-windows:
     name: Build bsky-desktop (Windows)
     runs-on: windows-latest
     env:
-      ext: "exe"
       GITHUB_TOKEN: ${{ secrets.GHT }}
 
     steps:
@@ -78,16 +84,22 @@ jobs:
 
       - name: Install dependencies
         run: npm install
+      
+      - name: Build (ia32)
+        run: npm run build -- --arch ia32
 
       - name: Build (x64)
         run: npm run build -- --arch x64
-
+      
       - name: Build (arm64)
         run: npm run build -- --arch arm64
 
       - name: Generate checksum
         run: |
           sha256sum dist/*.exe > dist/sha256sum.txt
+          sha256sum dist/*.msi >> dist/sha256sum.txt
+          sha256sum dist/*.appx >> dist/sha256sum.txt
+          sha256sum dist/*.zip >> dist/sha256sum.txt
 
       - name: Upload Windows Artifacts
         uses: actions/upload-artifact@v4
@@ -96,14 +108,16 @@ jobs:
           name: windows-artifacts
           path: |
             dist/*.exe
+            dist/*.msi
+            dist/*.appx
+            dist/*.zip
             dist/latest*.yml
             dist/sha256sum.txt
 
   build-macos:
     name: Build bsky-desktop (macOS)
     runs-on: macos-latest
     env:
-      ext: "dmg"
       GITHUB_TOKEN: ${{ secrets.GHT }}
 
     steps:
@@ -127,6 +141,8 @@ jobs:
       - name: Generate checksum
         run: |
           shasum -a 256 dist/*.dmg > dist/sha256sum.txt
+          shasum -a 256 dist/*.pkg >> dist/sha256sum.txt
+          shasum -a 256 dist/*.zip >> dist/sha256sum.txt
 
       - name: Upload macOS Artifacts
         uses: actions/upload-artifact@v4
@@ -135,6 +151,8 @@ jobs:
           name: macos-artifacts
           path: |
             dist/*.dmg
+            dist/*.pkg
+            dist/*.zip
             dist/latest*.yml
             dist/sha256sum.txt
 
@@ -189,8 +207,15 @@ jobs:
           generate_release_notes: true
           files: |
             dist/linux/*.AppImage
+            dist/linux/*.deb
+            dist/linux/*.zip
             dist/windows/*.exe
+            dist/windows/*.msi
+            dist/windows/*.appx
+            dist/windows/*.zip
             dist/macos/*.dmg
+            dist/macos/*.pkg
+            dist/macos/*.zip
             sha256sums.txt
 
   aur:

README.md

@@ -14,6 +14,20 @@ Bsky Desktop is an Electron-based application for Bsky that allows users to mana
 
 [![Packaging status](https://repology.org/badge/vertical-allrepos/bskydesktop.svg?columns=4&exclude_unsupported=1)](https://repology.org/project/bskydesktop/versions)
 
+#### Windows install options:
+- Zip (x64, arm64, ia32)
+- Setup (exe, msi, appx) (x64, arm64, ia32)
+
+#### Mac install options:
+- Zip (x64, arm64)
+- Dmg (x64, arm64)
+- Pkg (x64, arm64)
+
+#### Linux install options:
+- Zip (x64, arm64, ia32)
+- AppImage (x64, arm64, ia32)
+- Deb (x64, arm64, ia32)
+
 ### Build Instructions for Bsky Desktop
 
 To build and run Bsky Desktop locally, follow these steps:

build-app.js

@@ -0,0 +1,104 @@
+const path = require('path');
+const process = require('process');
+const builder = require('electron-builder');
+const { Platform, Arch } = builder;
+
+// Parse command-line arguments
+const supportedPlatforms = ['win', 'mac', 'linux'];
+const supportedArchitectures = ['x64', 'armv7l', 'arm64', 'ia32', 'universal'];
+const args = process.argv.slice(2);
+const carch = args.includes('--arch') ? args[args.indexOf('--arch') + 1] : null;
+const cplatform = args.includes('--platform') ? args[args.indexOf('--platform') + 1] : null;
+const pack = args.includes('--pack');  // Keep track of --pack as a boolean flag
+
+// Determine platform
+let platform;
+if (!cplatform) {
+    platform = process.platform === 'win32' ? 'win' :
+        process.platform === 'darwin' ? 'mac' :
+            process.platform === 'linux' ? 'linux' : null;
+} else if (!supportedPlatforms.includes(cplatform)) {
+    console.error(`Invalid platform specified. Supported platforms: ${supportedPlatforms.join(', ')}`);
+    process.exit(1);
+} else {
+    platform = cplatform;
+}
+
+// Determine architecture
+let arch = carch || (process.arch === 'arm' ? 'armv7l' : process.arch);
+if (!supportedArchitectures.includes(arch)) {
+    console.error(`Invalid architecture specified. Supported architectures: ${supportedArchitectures.join(', ')}`);
+    process.exit(1);
+}
+
+// Map platform and architecture to electron-builder enums
+const platformEnum = {
+    win: Platform.WINDOWS,
+    mac: Platform.MAC,
+    linux: Platform.LINUX
+}[platform];
+
+const archEnum = {
+    x64: Arch.x64,
+    armv7l: Arch.armv7l,
+    arm64: Arch.arm64,
+    ia32: Arch.ia32,
+    universal: Arch.universal
+}[arch];
+
+// Additional build arguments: (starting with --eb-)
+const buildArgs = args.filter((arg) => arg.startsWith('--eb-'));
+
+// If additional args are present, add them to the buildArgs array
+if (buildArgs.length > 0) {
+    console.log('Additional build arguments:', buildArgs);
+}
+
+// If pack is true, add --dir to buildArgs
+if (pack) {
+    buildArgs.push('--dir');
+}
+
+// Read build-config.json
+const buildConfigPath = path.join(__dirname, 'build-config.json');
+let buildConfig;
+try {
+    buildConfig = require(buildConfigPath);
+} catch (err) {
+    console.error(`Failed to read build-config.json: ${err.message}`);
+    process.exit(1);
+}
+
+// Generate artifact name
+const packageJson = require('../package.json');
+const artifactName = `${buildConfig.productName}-${packageJson.version}-${platform}-${arch}.\${ext}`;
+
+// Electron Builder configuration
+/**
+ * @type {import('electron-builder').Configuration}
+ */
+const options = {
+    artifactName,
+    nsis: {
+        deleteAppDataOnUninstall: true,
+        oneClick: true,
+        perMachine: false
+    },
+    dmg: {
+        contents: [
+            { type: 'file', x: 255, y: 85 },
+            { type: 'link', path: '/Applications', x: 253, y: 325 }
+        ]
+    },
+    ...buildConfig
+};
+
+// Build process
+builder.build({
+    targets: platformEnum.createTarget(null, archEnum),
+    config: options
+}).then(result => {
+    console.log("Build completed:", JSON.stringify(result, null, 2));
+}).catch(error => {
+    console.error("Build failed:", error);
+});