From 6c2bd3d9f3068fb9981b7145821ab3b037a9cc6d Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Fri, 29 Dec 2023 12:47:20 +0100 Subject: [PATCH] Reenable flatpak CI support --- .flatpak-manifest.json | 4 ++-- .gitlab-ci.yml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.flatpak-manifest.json b/.flatpak-manifest.json index dbb102a64..eff706ea2 100644 --- a/.flatpak-manifest.json +++ b/.flatpak-manifest.json @@ -2,12 +2,12 @@ "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)", - "finish-args": ["--share=ipc", "--socket=x11", "--socket=wayland", "--filesystem=host" ], + "finish-args": ["--share=ipc", "--socket=fallback-x11", "--socket=wayland", "--filesystem=host" ], "modules": [ { diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f83ceadb1..324be7d0a 100644 --- 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/flatpak.yml -- 2.47.3