Merge pull request #65 from prnake/fix_flatpak

feat: update flatpak build version

Author: Harry-Chen

.github/workflows/ubuntu.yml

@@ -42,23 +42,25 @@ jobs:
         with:
           name: ${{ env.targetName }}.linux.amd64
           path: build/src/danmaQ
-      # - name: Build flatpak
-      #   run: |
-      #     sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-      #     sudo flatpak install flathub org.kde.Sdk//5.15 io.qt.qtwebengine.BaseApp//5.15 -y
-      #     sudo flatpak-builder --repo=repo --force-clean build-dir org.tuna.danmaQ.local.json
-      #     sudo flatpak build-bundle repo danmaQ.flatpak org.tuna.danmaQ
-      #   working-directory: flatpak
-      # - uses: actions/upload-artifact@v4
-      #   with:
-      #     name: ${{ env.targetName }}.linux.amd64.flatpak
-      #     path: flatpak/danmaQ.flatpak
-      # - name: Update to release
-      #   if: startsWith(github.event.ref, 'refs/tags/')
-      #   uses: svenstaro/upload-release-action@v2
-      #   with:
-      #     repo_token: ${{ secrets.GITHUB_TOKEN }}
-      #     file: flatpak/danmaQ.flatpak
-      #     asset_name: ${{ env.targetName }}.linux.amd64.flatpak
-      #     tag: ${{ github.ref }}
-      #     overwrite: true
+      - name: Clean previous build
+        run: rm -rf build || true
+      - name: Build flatpak
+        run: |
+          sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+          sudo flatpak install flathub org.kde.Sdk//6.8 io.qt.qtwebengine.BaseApp//6.8 -y
+          sudo flatpak-builder --repo=repo --force-clean build-dir org.tuna.danmaQ.local.json
+          sudo flatpak build-bundle repo danmaQ.flatpak org.tuna.danmaQ
+        working-directory: flatpak
+      - uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.targetName }}.linux.amd64.flatpak
+          path: flatpak/danmaQ.flatpak
+      - name: Update to release
+        if: startsWith(github.event.ref, 'refs/tags/')
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: flatpak/danmaQ.flatpak
+          asset_name: ${{ env.targetName }}.linux.amd64.flatpak
+          tag: ${{ github.ref }}
+          overwrite: true

flatpak/install.sh

@@ -1,5 +1,5 @@
 flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-flatpak install flathub org.kde.Sdk//5.15
-flatpak install flathub io.qt.qtwebengine.BaseApp//5.15
+flatpak install flathub org.kde.Sdk//6.8
+flatpak install flathub io.qt.qtwebengine.BaseApp//6.8
 flatpak-builder --repo=repo --force-clean build-dir org.tuna.danmaQ.local.json
 flatpak build-bundle repo danmaQ.flatpak org.tuna.danmaQ

flatpak/org.tuna.danmaQ.json

@@ -2,8 +2,8 @@
     "id": "org.tuna.danmaQ",
     "runtime": "org.kde.Platform",
     "base": "io.qt.qtwebengine.BaseApp",
-    "base-version": "5.15",
-    "runtime-version": "5.15",
+    "base-version": "6.8",
+    "runtime-version": "6.8",
     "sdk": "org.kde.Sdk",
     "command": "danmaQ",
     "rename-desktop-file": "danmaQ.desktop",
@@ -19,7 +19,7 @@
             "name": "danmaQ",
             "buildsystem": "simple",
              "build-commands": [
-                "cmake . && make translations",
+                "cmake .",
                 "cmake -B build -DCMAKE_INSTALL_PREFIX=/app -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=Release",
                 "cd build && make"
             ],

flatpak/org.tuna.danmaQ.local.json

@@ -2,8 +2,8 @@
     "id": "org.tuna.danmaQ",
     "runtime": "org.kde.Platform",
     "base": "io.qt.qtwebengine.BaseApp",
-    "base-version": "5.15",
-    "runtime-version": "5.15",
+    "base-version": "6.8",
+    "runtime-version": "6.8",
     "sdk": "org.kde.Sdk",
     "command": "danmaQ",
     "rename-desktop-file": "danmaQ.desktop",
@@ -19,7 +19,7 @@
             "name": "danmaQ",
             "buildsystem": "simple",
              "build-commands": [
-                "cmake . && make translations",
+                "cmake .",
                 "cmake -B build -DCMAKE_INSTALL_PREFIX=/app -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=Release",
                 "cd build && make"
             ],