From 2656a93ee73183c936f0e75e710c8f0525d7dcef Mon Sep 17 00:00:00 2001 From: Tobias Fella Date: Mon, 11 Sep 2023 01:10:29 +0200 Subject: [PATCH] Disable Qt5 CI --- .gitlab-ci.yml | 6 +----- .kde-ci.yml | 38 +++++--------------------------------- 2 files changed, 6 insertions(+), 38 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 75dcb3734..6073ce437 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,12 +3,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/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 +# - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/flatpak.yml diff --git a/.kde-ci.yml b/.kde-ci.yml index 3f564d2ab..05c61344f 100644 --- a/.kde-ci.yml +++ b/.kde-ci.yml @@ -2,35 +2,7 @@ # SPDX-License-Identifier: BSD-2-Clause Dependencies: -- 'on': ['Linux/Qt5', 'Android/Qt5', 'FreeBSD/Qt5', 'Windows/Qt5'] - 'require': - 'frameworks/extra-cmake-modules': '@stable' - 'frameworks/kcoreaddons': '@stable' - 'frameworks/kirigami': '@stable' - 'frameworks/ki18n': '@stable' - 'frameworks/kconfig': '@stable' - 'frameworks/syntax-highlighting': '@stable' - 'frameworks/kitemmodels': '@stable' - 'frameworks/kquickcharts': '@stable' - 'frameworks/knotifications': '@stable' - 'libraries/kquickimageeditor': '@stable' - 'frameworks/sonnet': '@stable' - 'libraries/kirigami-addons': '@latest' - 'third-party/libquotient': '@latest' - 'third-party/qtkeychain': '@latest' - 'third-party/cmark': '@latest' - 'third-party/qcoro': '@latest' -- 'on': ['Windows/Qt5', 'Linux/Qt5', 'FreeBSD/Qt5'] - 'require': - 'frameworks/qqc2-desktop-style': '@stable' - 'frameworks/kio': '@stable' - 'frameworks/kwindowsystem': '@stable' - 'frameworks/kconfigwidgets': '@stable' -- 'on': ['Linux/Qt5', 'FreeBSD/Qt5'] - 'require': - 'frameworks/kdbusaddons': '@stable' - -- 'on': ['Linux/Qt6', 'Android/Qt6', 'FreeBSD/Qt6', 'Windows/Qt6'] +- 'on': ['Linux', 'Android', 'FreeBSD', 'Windows'] 'require': 'frameworks/extra-cmake-modules': '@latest-kf6' 'frameworks/kcoreaddons': '@latest-kf6' @@ -48,21 +20,21 @@ Dependencies: 'third-party/qtkeychain': '@latest' 'third-party/cmark': '@latest' 'third-party/qcoro': '@latest' -- 'on': ['Windows/Qt6', 'Linux/Qt6', 'FreeBSD/Qt6'] +- 'on': ['Windows', 'Linux', 'FreeBSD'] 'require': 'frameworks/qqc2-desktop-style': '@latest-kf6' 'frameworks/kio': '@latest-kf6' 'frameworks/kwindowsystem': '@latest-kf6' 'frameworks/kconfigwidgets': '@latest-kf6' -- 'on': ['Linux/Qt6', 'FreeBSD/Qt6'] +- 'on': ['Linux', 'FreeBSD'] 'require': 'frameworks/kdbusaddons': '@latest-kf6' 'frameworks/kstatusnotifieritem': '@latest-kf6' -- 'on': ['Linux/Qt6', 'Linux/Qt5'] +- 'on': ['Linux'] 'require': 'sdk/selenium-webdriver-at-spi': '@latest-kf6' Options: per-test-timeout: 90 - require-passing-tests-on: [ 'Linux/Qt5', 'FreeBSD', 'Windows' ] + require-passing-tests-on: [ 'FreeBSD', 'Windows' ]