[plasma/breeze/Plasma/6.7] /: Use ubuntu image for Qt5 CI
David Redondo <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit 7e329314f76f8b4ad19664bf1e3d813ed272b470 by David Redondo. Committed on 07/08/2026 at 14:27. Pushed by davidre into branch 'Plasma/6.7'. Use ubuntu image for Qt5 CI (cherry picked from commit 0a8e12763d8e88f2fb4a0a0d333249617e23300a) Co-authored-by: David Redondo <[email protected]> M +22 -1 .gitlab-ci.yml M +0 -14 .kde-ci.yml https://invent.kde.org/plasma/breeze/-/commit/7e329314f76f8b4ad19664bf1e3d813ed272b470 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 70ec9f70c..acdaa588c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,10 +4,31 @@ include: - project: sysadmin/ci-utilities file: - - /gitlab-templates/linux.yml - /gitlab-templates/linux-qt6.yml - /gitlab-templates/freebsd-qt6.yml - /gitlab-templates/windows-qt6.yml - /gitlab-templates/xml-lint.yml - /gitlab-templates/yaml-lint.yml - /gitlab-templates/linux-qt6-next.yml + +build_qt5_ubuntu_26_04: + stage: build + image: ubuntu:26.04 + tags: + - Linux + rules: + - !reference [.default_rules, rules] + before_script: + - sed -i 's/ deb/ deb deb-src/' /etc/apt/sources.list.d/ubuntu.sources + - apt-get update + - apt-get install --yes eatmydata + - eatmydata apt-get build-dep --yes --no-install-recommends kde-style-breeze-qt5 + - eatmydata apt-get install --yes --no-install-recommends ninja-build + script: + - mkdir -p build + - cmake -B build -G Ninja + - cmake --build build + - ctest --test-dir build --output-on-failure --output-junit JUnitTestResults.xml + artifacts: + reports: + junit: build/JUnitTestResults.xml diff --git a/.kde-ci.yml b/.kde-ci.yml index 533b548aa..990d5f1e6 100644 --- a/.kde-ci.yml +++ b/.kde-ci.yml @@ -2,20 +2,6 @@ # SPDX-License-Identifier: CC0-1.0 Dependencies: - - 'on': ['Linux/Qt5'] - 'require': - 'frameworks/extra-cmake-modules': '@latest' - 'frameworks/frameworkintegration': '@latest' - 'frameworks/kcmutils': '@latest' - 'frameworks/kconfig': '@latest' - 'frameworks/kconfigwidgets': '@latest' - 'frameworks/kcoreaddons': '@latest' - 'frameworks/kguiaddons': '@latest' - 'frameworks/ki18n': '@latest' - 'frameworks/kiconthemes': '@latest' - 'frameworks/kirigami': '@latest' - 'frameworks/kwindowsystem': '@latest' - - 'on': ['Linux/Qt6', 'FreeBSD/Qt6', 'Windows/Qt6', 'Linux/Qt6Next'] 'require': 'frameworks/extra-cmake-modules': '@latest-kf6'