From e59c96c6ee5d54eddf871c5e1f82ae4afa83a800 Mon Sep 17 00:00:00 2001 From: Tobias Fella Date: Tue, 12 Sep 2023 22:54:59 +0200 Subject: [PATCH] Remove Qt5 CI and enable Qt6 CI for all platforms --- .gitlab-ci.yml | 6 +----- .kde-ci.yml | 18 ++---------------- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9e464ee6..1a7df6c1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,12 +4,8 @@ include: - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/reuse-lint.yml -# - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml -# - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml -# - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android.yml -# - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml -# - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/flatpak.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml +# - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/flatpak.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android-qt6.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows-qt6.yml diff --git a/.kde-ci.yml b/.kde-ci.yml index 4785227b..197ea725 100644 --- a/.kde-ci.yml +++ b/.kde-ci.yml @@ -2,20 +2,7 @@ # SPDX-License-Identifier: BSD-2-Clause Dependencies: -- 'on': ['Linux/Qt5', 'FreeBSD/Qt5', 'Windows/Qt5', 'Android/Qt5'] - 'require': - 'frameworks/extra-cmake-modules': '@stable' - 'frameworks/kcoreaddons': '@stable' - 'frameworks/kirigami': '@stable' - 'frameworks/syndication': '@stable' - 'frameworks/ki18n': '@stable' - 'frameworks/kconfig': '@stable' - 'frameworks/threadweaver': '@stable' - 'libraries/kirigami-addons': '@stable' - 'third-party/qtkeychain': '@latest' - 'third-party/taglib': '@latest' - -- 'on': ['Linux/Qt6', 'FreeBSD/Qt6', 'Windows/Qt6', 'Android/Qt6'] +- 'on': ['Linux', 'FreeBSD', 'Windows', 'Android'] 'require': 'frameworks/extra-cmake-modules': '@latest-kf6' 'frameworks/kcoreaddons': '@latest-kf6' @@ -24,8 +11,7 @@ Dependencies: 'frameworks/ki18n': '@latest-kf6' 'frameworks/kconfig': '@latest-kf6' 'frameworks/threadweaver': '@latest-kf6' -# disable for now since this would pull in kf5 versions of kirigami and ki18n -# 'libraries/kirigami-addons': '@stable' + 'libraries/kirigami-addons': '@latest-kf6' 'third-party/qtkeychain': '@latest' 'third-party/taglib': '@latest'