mirror of https://github.com/KDE/kasts.git
Remove Qt5 CI and enable Qt6 CI for all platforms
This commit is contained in:
parent
2668b7acce
commit
e59c96c6ee
|
@ -4,12 +4,8 @@
|
||||||
|
|
||||||
include:
|
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/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/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/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/android-qt6.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/windows-qt6.yml
|
||||||
|
|
18
.kde-ci.yml
18
.kde-ci.yml
|
@ -2,20 +2,7 @@
|
||||||
# SPDX-License-Identifier: BSD-2-Clause
|
# SPDX-License-Identifier: BSD-2-Clause
|
||||||
|
|
||||||
Dependencies:
|
Dependencies:
|
||||||
- 'on': ['Linux/Qt5', 'FreeBSD/Qt5', 'Windows/Qt5', 'Android/Qt5']
|
- 'on': ['Linux', 'FreeBSD', 'Windows', 'Android']
|
||||||
'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']
|
|
||||||
'require':
|
'require':
|
||||||
'frameworks/extra-cmake-modules': '@latest-kf6'
|
'frameworks/extra-cmake-modules': '@latest-kf6'
|
||||||
'frameworks/kcoreaddons': '@latest-kf6'
|
'frameworks/kcoreaddons': '@latest-kf6'
|
||||||
|
@ -24,8 +11,7 @@ Dependencies:
|
||||||
'frameworks/ki18n': '@latest-kf6'
|
'frameworks/ki18n': '@latest-kf6'
|
||||||
'frameworks/kconfig': '@latest-kf6'
|
'frameworks/kconfig': '@latest-kf6'
|
||||||
'frameworks/threadweaver': '@latest-kf6'
|
'frameworks/threadweaver': '@latest-kf6'
|
||||||
# disable for now since this would pull in kf5 versions of kirigami and ki18n
|
'libraries/kirigami-addons': '@latest-kf6'
|
||||||
# 'libraries/kirigami-addons': '@stable'
|
|
||||||
'third-party/qtkeychain': '@latest'
|
'third-party/qtkeychain': '@latest'
|
||||||
'third-party/taglib': '@latest'
|
'third-party/taglib': '@latest'
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue