Reenable flatpak CI support

diff --git a/.flatpak-manifest.json b/.flatpak-manifest.json
index dbb102a641d05f7740710c2844300bb34767b910..eff706ea2a9bb0688666f30d60ebeff8a1f8c845 100644 (file)
--- a/.flatpak-manifest.json
+++ b/.flatpak-manifest.json
@@ -2,12 +2,12 @@
     "id": "org.kde.dolphin",
     "branch": "master",
     "runtime": "org.kde.Platform",
     "id": "org.kde.dolphin",
     "branch": "master",
     "runtime": "org.kde.Platform",

-    "runtime-version": "5.15-22.08",
+    "runtime-version": "6.6-kf6preview",

     "sdk": "org.kde.Sdk",
     "command": "dolphin",
     "tags": ["nightly"],
     "desktop-file-name-suffix": " (Nightly)",
     "sdk": "org.kde.Sdk",
     "command": "dolphin",
     "tags": ["nightly"],
     "desktop-file-name-suffix": " (Nightly)",

-    "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=host" ],
+    "finish-args": ["--share=ipc", "--socket=fallback-x11", "--socket=wayland", "--filesystem=host" ],

 
     "modules": [
         {
 
     "modules": [
         {

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f83ceadb117db588a8e91df99dfd8f55e1e18bdb..324be7d0a1b4222cc67c0889468e64bc4e9180be 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,3 +4,4 @@ include:
       - /gitlab-templates/linux-qt6.yml
       - /gitlab-templates/freebsd-qt6.yml
       - /gitlab-templates/windows-qt6.yml
       - /gitlab-templates/linux-qt6.yml
       - /gitlab-templates/freebsd-qt6.yml
       - /gitlab-templates/windows-qt6.yml

+      - /gitlab-templates/flatpak.yml