Git commit 70fa86946b892a460bd9213af0d807483aa5e265 by Ben Cooksley. Committed on 10/06/2023 at 21:08. Pushed by bcooksley into branch 'master'.
Correct the CI dependency declarations for selenium-webdriver-at-spi. The definition @same is reserved explicitly for projects within the same release unit to depend on each other. Given that selenium-webdriver-at-spi lives outside of Plasma, it is improper and incorrect for @same to be used here to bring in KPipeWire and KWin. The dependency definition also needs splitting between Qt 5 and Qt 6, as Plasma has opted to not support Qt 6 at all within the Plasma/5.27 series, and not support Qt 5 at all within the master branch series - yet we need to be able to support tests for both from the same branch. This should resolve the issue reported at plasma/plasma-workspace#71 CCMAIL: plasma-devel@kde.org M +12 -3 .kde-ci.yml https://invent.kde.org/sdk/selenium-webdriver-at-spi/-/commit/70fa86946b892a460bd9213af0d807483aa5e265 diff --git a/.kde-ci.yml b/.kde-ci.yml index 65511ea..1b53da3 100644 --- a/.kde-ci.yml +++ b/.kde-ci.yml @@ -2,13 +2,22 @@ # SPDX-License-Identifier: CC0-1.0 Dependencies: -- 'on': ['@all'] +- 'on': ['Linux/Qt6'] + 'require': + 'frameworks/extra-cmake-modules': '@latest-kf6' + 'frameworks/kwindowsystem': '@latest-kf6' + 'frameworks/kwayland': '@latest-kf6' + 'plasma/kwin': '@latest-kf6' + 'plasma/kpipewire': '@latest-kf6' + 'third-party/wayland': '@latest-kf6' + +- 'on': ['Linux/Qt5'] 'require': 'frameworks/extra-cmake-modules': '@latest' 'frameworks/kwindowsystem': '@latest' 'frameworks/kwayland': '@latest' - 'plasma/kwin': '@same' - 'plasma/kpipewire': '@same' + 'plasma/kwin': '@latest' + 'plasma/kpipewire': '@latest' 'third-party/wayland': '@latest' Options: