diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cc12d8eaa..ccb284932 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,11 +4,7 @@ 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/android.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/linux.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/windows.yml -# - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows-qt6.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/freebsd-qt6.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/flatpak.yml diff --git a/.kde-ci.yml b/.kde-ci.yml index 3ad1aef4b..b36c1a3f9 100644 --- a/.kde-ci.yml +++ b/.kde-ci.yml @@ -30,36 +30,7 @@ Dependencies: 'require': 'frameworks/kdbusaddons': '@stable' -- 'on': ['Linux/Qt6', 'Android/Qt6', 'FreeBSD/Qt6', 'Windows/Qt6'] - 'require': - 'frameworks/extra-cmake-modules': '@latest-kf6' - 'frameworks/kcoreaddons': '@latest-kf6' - 'frameworks/kirigami': '@latest-kf6' - 'frameworks/ki18n': '@latest-kf6' - 'frameworks/kconfig': '@latest-kf6' - 'frameworks/syntax-highlighting': '@latest-kf6' - 'frameworks/kitemmodels': '@latest-kf6' - 'frameworks/kquickcharts': '@latest-kf6' - 'frameworks/knotifications': '@latest-kf6' - 'libraries/kquickimageeditor': '@latest-kf6' - 'frameworks/sonnet': '@latest-kf6' - 'libraries/kirigami-addons': '@latest-kf6' - 'third-party/libquotient': '@latest' - 'third-party/qtkeychain': '@latest' - 'third-party/cmark': '@latest' - 'third-party/qcoro': '@latest' -- 'on': ['Windows/Qt6', 'Linux/Qt6', 'FreeBSD/Qt6'] - 'require': - 'frameworks/qqc2-desktop-style': '@latest-kf6' - 'frameworks/kio': '@latest-kf6' - 'frameworks/kwindowsystem': '@latest-kf6' - 'frameworks/kconfigwidgets': '@latest-kf6' -- 'on': ['Linux/Qt6', 'FreeBSD/Qt6'] - 'require': - 'frameworks/kdbusaddons': '@latest-kf6' - 'frameworks/kstatusnotifieritem': '@latest-kf6' - -- 'on': ['Linux/Qt6', 'Linux/Qt5'] +- 'on': ['Linux/Qt5'] 'require': 'sdk/selenium-webdriver-at-spi': '@latest-kf6'