From 549affa4c339b12f08dfc63c04525758c576ef00 Mon Sep 17 00:00:00 2001 From: Nicolas Fella Date: Mon, 4 Dec 2023 17:41:38 +0100 Subject: [PATCH] Switch CI to Qt6 --- .gitlab-ci.yml | 4 ++-- .kde-ci.yml | 33 +++++++++++++++++---------------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9451fad4..f6e2f69c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,5 +4,5 @@ include: - project: sysadmin/ci-utilities file: - - /gitlab-templates/linux.yml - - /gitlab-templates/freebsd.yml + - /gitlab-templates/linux-qt6.yml + - /gitlab-templates/freebsd-qt6.yml diff --git a/.kde-ci.yml b/.kde-ci.yml index 68164f80..53ff73b5 100644 --- a/.kde-ci.yml +++ b/.kde-ci.yml @@ -4,19 +4,20 @@ Dependencies: - 'on': ['@all'] 'require': - 'frameworks/extra-cmake-modules': '@stable' - 'frameworks/ki18n': '@stable' - 'frameworks/kconfig': '@stable' - 'frameworks/kcoreaddons': '@stable' - 'frameworks/kcrash': '@stable' - 'frameworks/kdbusaddons': '@stable' - 'frameworks/kdnssd': '@stable' - 'frameworks/kdoctools': '@stable' - 'frameworks/knotifications': '@stable' - 'frameworks/kwallet': '@stable' - 'frameworks/kwidgetsaddons': '@stable' - 'frameworks/kwindowsystem': '@stable' - 'frameworks/kxmlgui': '@stable' - 'libraries/plasma-wayland-protocols': '@latest' # can be switched to @stable when 1.5.0 is released - 'plasma/kwayland': '@stable' - 'plasma/kpipewire': '@latest' + 'frameworks/extra-cmake-modules': '@latest-kf6' + 'frameworks/ki18n': '@latest-kf6' + 'frameworks/kconfig': '@latest-kf6' + 'frameworks/kcoreaddons': '@latest-kf6' + 'frameworks/kcrash': '@latest-kf6' + 'frameworks/kdbusaddons': '@latest-kf6' + 'frameworks/kdnssd': '@latest-kf6' + 'frameworks/kdoctools': '@latest-kf6' + 'frameworks/knotifications': '@latest-kf6' + 'frameworks/kwallet': '@latest-kf6' + 'frameworks/kwidgetsaddons': '@latest-kf6' + 'frameworks/kwindowsystem': '@latest-kf6' + 'frameworks/kxmlgui': '@latest-kf6' + 'frameworks/kstatusnotifieritem': '@latest-kf6' + 'libraries/plasma-wayland-protocols': '@latest-kf6' + 'plasma/kwayland': '@latest-kf6' + 'plasma/kpipewire': '@latest-kf6'