From 887d43f370b8a5fad2f99835f4f15572b629a414 Mon Sep 17 00:00:00 2001 From: Simon Redman Date: Sat, 30 Dec 2023 14:38:17 +0000 Subject: [PATCH] Reenable craft pipeline After https://invent.kde.org/packaging/craft-blueprints-kde/-/merge_requests/755 and https://invent.kde.org/packaging/craft-blueprints-kde/-/merge_requests/756, the build passes! Now we'll never* regress the craft packaging again! *Warranty neither expressed nor implied --- .craft.ini | 3 +++ .gitlab-ci.yml | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.craft.ini b/.craft.ini index c262b8ec6..4f7348a18 100644 --- a/.craft.ini +++ b/.craft.ini @@ -3,3 +3,6 @@ [BlueprintSettings] kde/applications/kdeconnect-kde.packageAppx = True +# Need the tip of master to build with Qt6. Remove once the release vesion has Qt6 support. +kde/plasma/breeze.version=master +kde/unreleased/kirigami-addons.version=master diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 06e26021a..70aa3b25a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,5 +10,5 @@ include: - /gitlab-templates/freebsd-qt6.yml - /gitlab-templates/windows-qt6.yml - /gitlab-templates/clang-format.yml - # - /gitlab-templates/craft-windows-x86-64-qt6.yml TODO re-enable when Qt6 Craft build works - # - /gitlab-templates/craft-windows-appx-qt6.yml + - /gitlab-templates/craft-windows-x86-64-qt6.yml + - /gitlab-templates/craft-windows-appx-qt6.yml