Packaging different architectures and installers for windows (#3185)

* packaging different architectures for windows * appx for the windows store app hosting * remove unneeded applicationid * adding windows store assets * adding images * appx added to artifacts * add appx to release * remove override build params * being specific about the mac build - default is dmg * are these all needed.. Seems so * removing appx from the release notes as its only for the windows store * moving appxs to a different artifact for smaller download * Update electron-pr.yml * update version * update release process to remove actual-windows.exe because it can possible be the wrong arch
actualbudget · Aug 20, 2024 · 3e5ce72 · 3e5ce72
1 parent b347f03
commit 3e5ce72
Show file tree

Hide file tree

Showing 90 changed files with 51 additions and 5 deletions.
diff --git a/.github/workflows/electron-master.yml b/.github/workflows/electron-master.yml
@@ -62,13 +62,22 @@ jobs:
           path: |
             packages/desktop-electron/dist/*.dmg
             packages/desktop-electron/dist/*.exe
+            !packages/desktop-electron/dist/Actual-windows.exe
             packages/desktop-electron/dist/*.AppImage
             packages/desktop-electron/dist/*.flatpak
+      - name: Upload Windows Store Build
+        if: ${{ startsWith(matrix.os, 'windows') }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: actual-electron-${{ matrix.os }}-appx
+          path: |
+            packages/desktop-electron/dist/*.appx
       - name: Add to Release
         uses: softprops/action-gh-release@v2
         with:
           files: |
             packages/desktop-electron/dist/*.dmg
             packages/desktop-electron/dist/*.exe
+            !packages/desktop-electron/dist/Actual-windows.exe
             packages/desktop-electron/dist/*.AppImage
             packages/desktop-electron/dist/*.flatpak
diff --git a/.github/workflows/electron-pr.yml b/.github/workflows/electron-pr.yml
@@ -52,5 +52,13 @@ jobs:
           path: |
             packages/desktop-electron/dist/*.dmg
             packages/desktop-electron/dist/*.exe
+            !packages/desktop-electron/dist/Actual-windows.exe
             packages/desktop-electron/dist/*.AppImage
             packages/desktop-electron/dist/*.flatpak
+      - name: Upload Windows Store Build
+        if: ${{ startsWith(matrix.os, 'windows') }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: actual-electron-${{ matrix.os }}-appx
+          path: |
+            packages/desktop-electron/dist/*.appx
diff --git a/packages/desktop-electron/appx/LargeTile.png b/packages/desktop-electron/appx/LargeTile.png
diff --git a/packages/desktop-electron/appx/LargeTile.scale-100.png b/packages/desktop-electron/appx/LargeTile.scale-100.png
diff --git a/packages/desktop-electron/appx/LargeTile.scale-125.png b/packages/desktop-electron/appx/LargeTile.scale-125.png
diff --git a/packages/desktop-electron/appx/LargeTile.scale-150.png b/packages/desktop-electron/appx/LargeTile.scale-150.png
diff --git a/packages/desktop-electron/appx/LargeTile.scale-200.png b/packages/desktop-electron/appx/LargeTile.scale-200.png
diff --git a/packages/desktop-electron/appx/LargeTile.scale-400.png b/packages/desktop-electron/appx/LargeTile.scale-400.png
diff --git a/packages/desktop-electron/appx/SmallTile.png b/packages/desktop-electron/appx/SmallTile.png
diff --git a/packages/desktop-electron/appx/SmallTile.scale-100.png b/packages/desktop-electron/appx/SmallTile.scale-100.png
diff --git a/packages/desktop-electron/appx/SmallTile.scale-125.png b/packages/desktop-electron/appx/SmallTile.scale-125.png
diff --git a/packages/desktop-electron/appx/SmallTile.scale-150.png b/packages/desktop-electron/appx/SmallTile.scale-150.png
diff --git a/packages/desktop-electron/appx/SmallTile.scale-200.png b/packages/desktop-electron/appx/SmallTile.scale-200.png
diff --git a/packages/desktop-electron/appx/SmallTile.scale-400.png b/packages/desktop-electron/appx/SmallTile.scale-400.png
diff --git a/packages/desktop-electron/appx/SplashScreen.scale-100.png b/packages/desktop-electron/appx/SplashScreen.scale-100.png
diff --git a/packages/desktop-electron/appx/SplashScreen.scale-125.png b/packages/desktop-electron/appx/SplashScreen.scale-125.png
diff --git a/packages/desktop-electron/appx/SplashScreen.scale-150.png b/packages/desktop-electron/appx/SplashScreen.scale-150.png
diff --git a/packages/desktop-electron/appx/SplashScreen.scale-200.png b/packages/desktop-electron/appx/SplashScreen.scale-200.png
diff --git a/packages/desktop-electron/appx/SplashScreen.scale-400.png b/packages/desktop-electron/appx/SplashScreen.scale-400.png
diff --git a/packages/desktop-electron/appx/Square150x150Logo.png b/packages/desktop-electron/appx/Square150x150Logo.png
diff --git a/packages/desktop-electron/appx/Square150x150Logo.scale-100.png b/packages/desktop-electron/appx/Square150x150Logo.scale-100.png
diff --git a/packages/desktop-electron/appx/Square150x150Logo.scale-125.png b/packages/desktop-electron/appx/Square150x150Logo.scale-125.png
diff --git a/packages/desktop-electron/appx/Square150x150Logo.scale-150.png b/packages/desktop-electron/appx/Square150x150Logo.scale-150.png
diff --git a/packages/desktop-electron/appx/Square150x150Logo.scale-200.png b/packages/desktop-electron/appx/Square150x150Logo.scale-200.png
diff --git a/packages/desktop-electron/appx/Square150x150Logo.scale-400.png b/packages/desktop-electron/appx/Square150x150Logo.scale-400.png
diff --git a/...s/desktop-electron/appx/Square44x44Logo.altform-lightunplated_targetsize-16.png b/...s/desktop-electron/appx/Square44x44Logo.altform-lightunplated_targetsize-16.png
diff --git a/...s/desktop-electron/appx/Square44x44Logo.altform-lightunplated_targetsize-20.png b/...s/desktop-electron/appx/Square44x44Logo.altform-lightunplated_targetsize-20.png
diff --git a/...s/desktop-electron/appx/Square44x44Logo.altform-lightunplated_targetsize-24.png b/...s/desktop-electron/appx/Square44x44Logo.altform-lightunplated_targetsize-24.png
diff --git a/.../desktop-electron/appx/Square44x44Logo.altform-lightunplated_targetsize-256.png b/.../desktop-electron/appx/Square44x44Logo.altform-lightunplated_targetsize-256.png
diff --git a/...s/desktop-electron/appx/Square44x44Logo.altform-lightunplated_targetsize-30.png b/...s/desktop-electron/appx/Square44x44Logo.altform-lightunplated_targetsize-30.png
diff --git a/...s/desktop-electron/appx/Square44x44Logo.altform-lightunplated_targetsize-32.png b/...s/desktop-electron/appx/Square44x44Logo.altform-lightunplated_targetsize-32.png
diff --git a/...s/desktop-electron/appx/Square44x44Logo.altform-lightunplated_targetsize-36.png b/...s/desktop-electron/appx/Square44x44Logo.altform-lightunplated_targetsize-36.png
diff --git a/...s/desktop-electron/appx/Square44x44Logo.altform-lightunplated_targetsize-40.png b/...s/desktop-electron/appx/Square44x44Logo.altform-lightunplated_targetsize-40.png
diff --git a/...s/desktop-electron/appx/Square44x44Logo.altform-lightunplated_targetsize-44.png b/...s/desktop-electron/appx/Square44x44Logo.altform-lightunplated_targetsize-44.png
diff --git a/...s/desktop-electron/appx/Square44x44Logo.altform-lightunplated_targetsize-48.png b/...s/desktop-electron/appx/Square44x44Logo.altform-lightunplated_targetsize-48.png
diff --git a/...s/desktop-electron/appx/Square44x44Logo.altform-lightunplated_targetsize-60.png b/...s/desktop-electron/appx/Square44x44Logo.altform-lightunplated_targetsize-60.png
diff --git a/...s/desktop-electron/appx/Square44x44Logo.altform-lightunplated_targetsize-64.png b/...s/desktop-electron/appx/Square44x44Logo.altform-lightunplated_targetsize-64.png
diff --git a/...s/desktop-electron/appx/Square44x44Logo.altform-lightunplated_targetsize-72.png b/...s/desktop-electron/appx/Square44x44Logo.altform-lightunplated_targetsize-72.png
diff --git a/...s/desktop-electron/appx/Square44x44Logo.altform-lightunplated_targetsize-80.png b/...s/desktop-electron/appx/Square44x44Logo.altform-lightunplated_targetsize-80.png
diff --git a/...s/desktop-electron/appx/Square44x44Logo.altform-lightunplated_targetsize-96.png b/...s/desktop-electron/appx/Square44x44Logo.altform-lightunplated_targetsize-96.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.altform-unplated_targetsize-16.png b/packages/desktop-electron/appx/Square44x44Logo.altform-unplated_targetsize-16.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.altform-unplated_targetsize-20.png b/packages/desktop-electron/appx/Square44x44Logo.altform-unplated_targetsize-20.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.altform-unplated_targetsize-24.png b/packages/desktop-electron/appx/Square44x44Logo.altform-unplated_targetsize-24.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.altform-unplated_targetsize-256.png b/packages/desktop-electron/appx/Square44x44Logo.altform-unplated_targetsize-256.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.altform-unplated_targetsize-30.png b/packages/desktop-electron/appx/Square44x44Logo.altform-unplated_targetsize-30.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.altform-unplated_targetsize-32.png b/packages/desktop-electron/appx/Square44x44Logo.altform-unplated_targetsize-32.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.altform-unplated_targetsize-36.png b/packages/desktop-electron/appx/Square44x44Logo.altform-unplated_targetsize-36.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.altform-unplated_targetsize-40.png b/packages/desktop-electron/appx/Square44x44Logo.altform-unplated_targetsize-40.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.altform-unplated_targetsize-44.png b/packages/desktop-electron/appx/Square44x44Logo.altform-unplated_targetsize-44.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.altform-unplated_targetsize-48.png b/packages/desktop-electron/appx/Square44x44Logo.altform-unplated_targetsize-48.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.altform-unplated_targetsize-60.png b/packages/desktop-electron/appx/Square44x44Logo.altform-unplated_targetsize-60.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.altform-unplated_targetsize-64.png b/packages/desktop-electron/appx/Square44x44Logo.altform-unplated_targetsize-64.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.altform-unplated_targetsize-72.png b/packages/desktop-electron/appx/Square44x44Logo.altform-unplated_targetsize-72.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.altform-unplated_targetsize-80.png b/packages/desktop-electron/appx/Square44x44Logo.altform-unplated_targetsize-80.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.altform-unplated_targetsize-96.png b/packages/desktop-electron/appx/Square44x44Logo.altform-unplated_targetsize-96.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.png b/packages/desktop-electron/appx/Square44x44Logo.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.scale-100.png b/packages/desktop-electron/appx/Square44x44Logo.scale-100.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.scale-125.png b/packages/desktop-electron/appx/Square44x44Logo.scale-125.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.scale-150.png b/packages/desktop-electron/appx/Square44x44Logo.scale-150.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.scale-200.png b/packages/desktop-electron/appx/Square44x44Logo.scale-200.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.scale-400.png b/packages/desktop-electron/appx/Square44x44Logo.scale-400.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.targetsize-16.png b/packages/desktop-electron/appx/Square44x44Logo.targetsize-16.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.targetsize-20.png b/packages/desktop-electron/appx/Square44x44Logo.targetsize-20.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.targetsize-24.png b/packages/desktop-electron/appx/Square44x44Logo.targetsize-24.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.targetsize-256.png b/packages/desktop-electron/appx/Square44x44Logo.targetsize-256.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.targetsize-30.png b/packages/desktop-electron/appx/Square44x44Logo.targetsize-30.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.targetsize-32.png b/packages/desktop-electron/appx/Square44x44Logo.targetsize-32.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.targetsize-36.png b/packages/desktop-electron/appx/Square44x44Logo.targetsize-36.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.targetsize-40.png b/packages/desktop-electron/appx/Square44x44Logo.targetsize-40.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.targetsize-44.png b/packages/desktop-electron/appx/Square44x44Logo.targetsize-44.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.targetsize-48.png b/packages/desktop-electron/appx/Square44x44Logo.targetsize-48.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.targetsize-60.png b/packages/desktop-electron/appx/Square44x44Logo.targetsize-60.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.targetsize-64.png b/packages/desktop-electron/appx/Square44x44Logo.targetsize-64.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.targetsize-72.png b/packages/desktop-electron/appx/Square44x44Logo.targetsize-72.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.targetsize-80.png b/packages/desktop-electron/appx/Square44x44Logo.targetsize-80.png
diff --git a/packages/desktop-electron/appx/Square44x44Logo.targetsize-96.png b/packages/desktop-electron/appx/Square44x44Logo.targetsize-96.png
diff --git a/packages/desktop-electron/appx/StoreLogo.png b/packages/desktop-electron/appx/StoreLogo.png
diff --git a/packages/desktop-electron/appx/StoreLogo.scale-100.png b/packages/desktop-electron/appx/StoreLogo.scale-100.png
diff --git a/packages/desktop-electron/appx/StoreLogo.scale-125.png b/packages/desktop-electron/appx/StoreLogo.scale-125.png
diff --git a/packages/desktop-electron/appx/StoreLogo.scale-150.png b/packages/desktop-electron/appx/StoreLogo.scale-150.png
diff --git a/packages/desktop-electron/appx/StoreLogo.scale-200.png b/packages/desktop-electron/appx/StoreLogo.scale-200.png
diff --git a/packages/desktop-electron/appx/StoreLogo.scale-400.png b/packages/desktop-electron/appx/StoreLogo.scale-400.png
diff --git a/packages/desktop-electron/appx/Wide310x150Logo.png b/packages/desktop-electron/appx/Wide310x150Logo.png
diff --git a/packages/desktop-electron/appx/Wide310x150Logo.scale-100.png b/packages/desktop-electron/appx/Wide310x150Logo.scale-100.png
diff --git a/packages/desktop-electron/appx/Wide310x150Logo.scale-125.png b/packages/desktop-electron/appx/Wide310x150Logo.scale-125.png
diff --git a/packages/desktop-electron/appx/Wide310x150Logo.scale-150.png b/packages/desktop-electron/appx/Wide310x150Logo.scale-150.png
diff --git a/packages/desktop-electron/appx/Wide310x150Logo.scale-200.png b/packages/desktop-electron/appx/Wide310x150Logo.scale-200.png
diff --git a/packages/desktop-electron/appx/Wide310x150Logo.scale-400.png b/packages/desktop-electron/appx/Wide310x150Logo.scale-400.png
diff --git a/packages/desktop-electron/package.json b/packages/desktop-electron/package.json
@@ -3,13 +3,13 @@
   "author": "Actual",
   "productName": "Actual",
   "description": "A simple and powerful personal finance system",
-  "version": "24.8.0",
+  "version": "24.8.3",
   "scripts": {
     "clean": "rm -rf dist",
     "update-client": "bin/update-client",
     "build": "yarn build:dist && electron-builder",
-    "build:dist": "tsc --p tsconfig.dist.json && yarn copy-static-html",
-    "copy-static-html": "copyfiles --exclude 'build/**/*' **/*.html icons/**/* build",
+    "build:dist": "tsc --p tsconfig.dist.json && yarn copy-static-assets",
+    "copy-static-assets": "copyfiles --exclude 'build/**/*' **/*.html icons/**/* appx/**/* build",
     "watch": "yarn build:dist && cross-env ACTUAL_DOCUMENT_DIR=\"../../data\" ACTUAL_DATA_DIR=\"../../data\" electron ."
   },
   "main": "build/index.js",
@@ -56,9 +56,32 @@
       "baseVersion": "23.08"
     },
     "win": {
-      "target": "nsis",
+      "target": [
+        {
+          "target": "appx",
+          "arch": [
+            "ia32",
+            "x64",
+            "arm64"
+          ]
+        },
+        {
+          "target": "nsis",
+          "arch": [
+            "ia32",
+            "x64",
+            "arm64"
+          ]
+        }
+      ],
       "icon": "icons/icon.ico",
-      "artifactName": "${productName}-windows.${ext}"
+      "artifactName": "${productName}-windows-${arch}.${ext}"
+    },
+    "appx": {
+      "identityName": "actualbudget.org.ActualBudget",
+      "publisherDisplayName": "actualbudget.org",
+      "displayName": "Actual Budget",
+      "publisher": "CN=19454997-90E1-4473-879D-96D6A77A6056"
     },
     "npmRebuild": false
   },

diff --git a/upcoming-release-notes/3185.md b/upcoming-release-notes/3185.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [MikesGlitch]
+---
+
+Package Electron app as Appx for use in the Windows Store.