Merge branch 'develop' into flatpak

.github/workflows/build-app-beta.yaml

@@ -12,8 +12,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macOS-10.15, windows-2022, ubuntu-22.04]
-        # os: [macOS-10.15]
+        # os: [macOS-10.15, windows-2022, ubuntu-22.04]
+        os: [ubuntu-22.04]
 
     steps:
       - name: Context
@@ -48,6 +48,14 @@ jobs:
       - name: Install Snapcraft
         if: matrix.os == 'ubuntu-22.04'
         uses: samuelmeuli/action-snapcraft@v1
+      - name: Install flatpak
+        if: matrix.os == 'ubuntu-22.04'
+        run: |
+          sudo apt install flatpak flatpak-builder --yes
+          flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+          flatpak install --user --assumeyes --runtime flathub org.freedesktop.Platform/x86_64/22.08 
+          flatpak install --user --assumeyes --runtime flathub org.freedesktop.Sdk/x86_64/22.08
+          flatpak install --user --assumeyes --app flathub org.electronjs.Electron2.BaseApp/x86_64/22.08
       - name: Publish
         run: |
           yarn run build:app
@@ -65,6 +73,13 @@ jobs:
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
 
+      - name: Build flatpak
+        if: matrix.os == 'ubuntu-22.04'
+        run: |
+          yarn run build:app:flatpak
+        env:
+          GH_TOKEN: ${{ secrets.GH_TOKEN }} # token for electron publish
+
       - name: publishSnap
         if: matrix.os == 'ubuntu-22.04'
         run: |
@@ -92,6 +107,7 @@ jobs:
           mv app/dist/*.deb artifacts/ || true
           mv app/dist/*.snap artifacts/ || true
           mv app/dist/*.dmg artifacts/ || true
+          mv app/dist/*.flatpak artifacts/ || true
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v1

app/package.json

@@ -69,6 +69,11 @@
         "ELECTRON_SNAP": "true"
       }
     },
+    "flatpak": {
+      "license": "LICENSE",
+      "runtimeVersion": "22.08",
+      "baseVersion": "22.08"
+    },
     "win": {
       "target": [
         {
@@ -102,7 +107,7 @@
   "scripts": {
     "start": "cross-env ELECTRON_START_URL=http://localhost:5001 DEVMODE=1 electron .",
     "start:local": "cross-env electron .",
-    "dist": "electron-builder",
+    "dist": "cross-env DEBUG=@malept/flatpak-bundler electron-builder",
     "build": "cd ../packages/api && yarn build && cd ../web && yarn build && cd ../../app && yarn dist",
     "build:local": "cd ../packages/api && yarn build && cd ../web && yarn build && cd ../../app && yarn predist",
     "postinstall": "yarn rebuild && patch-package",

package.json

@@ -31,6 +31,7 @@
     "build:tools": "yarn workspace dbgate-tools build",
     "build:lib": "yarn build:sqltree && yarn build:tools && yarn build:filterparser && yarn build:datalib",
     "build:app": "yarn plugins:copydist && cd app && yarn install && yarn build",
+    "build:app:flatpak": "node setBuildFlatpak && cd app && yarn dist",
     "build:api": "yarn workspace dbgate-api build",
     "build:web:docker": "yarn workspace dbgate-web build",
     "build:plugins:frontend": "workspaces-run --only=\"dbgate-plugin-*\" -- yarn build:frontend",

setBuildFlatpak.js

@@ -0,0 +1,9 @@
+const fs = require('fs');
+
+const packageJson = fs.readFileSync('app/package.json', { encoding: 'utf-8' });
+const json = JSON.parse(packageJson);
+
+json.build.linux.target = ['flatpak'];
+json.build.appId = 'org.dbgate.DbGate';
+
+fs.writeFileSync('app/package.json', JSON.stringify(json, undefined, 2));