A local-first personal finance app
add flatpak to electron build list (#2617)
youngcw84fbc7e464cd
diff --git a/.github/workflows/electron-master.yml b/.github/workflows/electron-master.ymlindex 77ed3e3e02..64b8531f22 100644--- 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 environmentuses: ./.github/actions/setup- name: Build Electron@@ -48,3 +56,4 @@ jobs:packages/desktop-electron/dist/*.dmgpackages/desktop-electron/dist/*.exepackages/desktop-electron/dist/*.AppImage+ packages/desktop-electron/dist/*.flatpakdiff --git a/.github/workflows/electron-pr.yml b/.github/workflows/electron-pr.ymlindex 58e1eda7c4..4a87801a7e 100644--- 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 environmentuses: ./.github/actions/setup- name: Build Electron@@ -41,3 +49,4 @@ jobs:packages/desktop-electron/dist/*.dmgpackages/desktop-electron/dist/*.exepackages/desktop-electron/dist/*.AppImage+ packages/desktop-electron/dist/*.flatpakdiff --git a/packages/desktop-electron/package.json b/packages/desktop-electron/package.jsonindex c617788c85..47c6016338 100644--- 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.mdnew file mode 100644index 0000000000..79b03b2da5--- /dev/null+++ b/upcoming-release-notes/2617.md@@ -0,0 +1,6 @@+---+category: Enhancements+authors: [youngcw]+---++Include flatpak in the electron build list