add flatpak to electron build list (#2617)

* add flatpack to electron build * note * add to workflow * try to fix workflow * typos * workflow * work * update * add repo * update other electron workflow * stable doesn't work * fix version
actualbudget · Apr 19, 2024 · 84fbc7e · 84fbc7e
1 parent 5f77b87
commit 84fbc7e
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 1 deletion.
diff --git a/.github/workflows/electron-master.yml b/.github/workflows/electron-master.yml
@@ -31,6 +31,14 @@ jobs:
         run: pip.exe install setuptools
       - if: ${{ ! startsWith(matrix.os, 'windows') }}
         run: python3 -m pip install setuptools
+      - if: ${{ startsWith(matrix.os, 'ubuntu') }}
+        run: |
+          sudo apt-get install flatpak -y
+          sudo apt-get install flatpak-builder -y
+          sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+          sudo flatpak install org.freedesktop.Sdk/x86_64/23.08 -y
+          sudo flatpak install org.freedesktop.Platform/x86_64/23.08 -y
+          sudo flatpak install org.electronjs.Electron2.BaseApp/x86_64/23.08 -y
       - name: Set up environment
         uses: ./.github/actions/setup
       - name: Build Electron
@@ -48,3 +56,4 @@ jobs:
             packages/desktop-electron/dist/*.dmg
             packages/desktop-electron/dist/*.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
@@ -29,6 +29,14 @@ jobs:
         run: pip.exe install setuptools
       - if: ${{ ! startsWith(matrix.os, 'windows') }}
         run: python3 -m pip install setuptools
+      - if: ${{ startsWith(matrix.os, 'ubuntu') }}
+        run: |
+          sudo apt-get install flatpak -y
+          sudo apt-get install flatpak-builder -y
+          sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+          sudo flatpak install org.freedesktop.Sdk/x86_64/23.08 -y
+          sudo flatpak install org.freedesktop.Platform/x86_64/23.08 -y
+          sudo flatpak install org.electronjs.Electron2.BaseApp/x86_64/23.08 -y
       - name: Set up environment
         uses: ./.github/actions/setup
       - name: Build Electron
@@ -41,3 +49,4 @@ jobs:
             packages/desktop-electron/dist/*.dmg
             packages/desktop-electron/dist/*.exe
             packages/desktop-electron/dist/*.AppImage
+            packages/desktop-electron/dist/*.flatpak
diff --git a/packages/desktop-electron/package.json b/packages/desktop-electron/package.json
@@ -37,9 +37,16 @@
       }
     },
     "linux": {
-      "target": "AppImage",
+      "target": [
+        "flatpak",
+        "AppImage"
+      ],
       "artifactName": "${productName}-${version}-${arch}.${ext}"
     },
+    "flatpak": {
+      "runtimeVersion": "23.08",
+      "baseVersion": "23.08"
+    },
     "win": {
       "target": "nsis",
       "icon": "icons/icon.ico"

diff --git a/upcoming-release-notes/2617.md b/upcoming-release-notes/2617.md
@@ -0,0 +1,6 @@
+---
+category: Enhancements
+authors: [youngcw]
+---
+
+Include flatpak in the electron build list