[education/rkward/kf5] /: Update ci

Thomas Friedrichsmeier null at kde.org
Wed Apr 10 16:12:08 BST 2024


Git commit 4c0221456592579f1c06478b461b3bc4d24bfe3d by Thomas Friedrichsmeier, on behalf of Carl Schwan.
Committed on 01/04/2024 at 11:45.
Pushed by tfry into branch 'kf5'.

Update ci

M  +3    -3    .flatpak-manifest.json
M  +4    -4    .gitlab-ci.yml
M  +13   -13   .kde-ci.yml

https://invent.kde.org/education/rkward/-/commit/4c0221456592579f1c06478b461b3bc4d24bfe3d

diff --git a/.flatpak-manifest.json b/.flatpak-manifest.json
index 6444d5e15..5f049b195 100644
--- a/.flatpak-manifest.json
+++ b/.flatpak-manifest.json
@@ -2,10 +2,10 @@
     "id": "org.kde.rkward",
     "branch": "master",
     "runtime": "org.kde.Platform",
-    "runtime-version": "5.15-22.08",
+    "runtime-version": "6.6",
     "sdk": "org.kde.Sdk",
     "base": "io.qt.qtwebengine.BaseApp",
-    "base-version": "5.15-22.08",
+    "base-version": "6.6",
     "command": "rkward",
     "tags": ["nightly"],
     "desktop-file-name-suffix": " (Nightly)",
@@ -39,7 +39,7 @@
         {
             "name": "kate",
             "buildsystem": "cmake-ninja",
-            "sources": [ { "type": "git", "url": "https://invent.kde.org/utilities/kate.git", "branch": "release/23.08" } ]
+            "sources": [ { "type": "git", "url": "https://invent.kde.org/utilities/kate.git", "branch": "master" } ]
         },
         {
             "buildsystem": "cmake",
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2b114b8b6..c05ca0863 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,8 +5,8 @@ include:
   - project: sysadmin/ci-utilities
     file:
       - /gitlab-templates/reuse-lint.yml
-      - /gitlab-templates/linux.yml
-      - /gitlab-templates/freebsd.yml
-      - /gitlab-templates/windows.yml
+      - /gitlab-templates/linux-qt6.yml
+      - /gitlab-templates/freebsd-qt6.yml
+      - /gitlab-templates/windows-qt6.yml
       - /gitlab-templates/flatpak.yml
-      - /gitlab-templates/craft-appimage.yml
\ No newline at end of file
+      - /gitlab-templates/craft-appimage-qt6.yml
\ No newline at end of file
diff --git a/.kde-ci.yml b/.kde-ci.yml
index 56a072017..1ec78feec 100644
--- a/.kde-ci.yml
+++ b/.kde-ci.yml
@@ -4,19 +4,19 @@
 Dependencies:
 - 'on': ['@all']
   'require':
-    'frameworks/extra-cmake-modules': '@stable'
-    'frameworks/kcoreaddons': '@stable'
-    'frameworks/kdoctools': '@stable'
-    'frameworks/ki18n': '@stable'
-    'frameworks/kxmlgui': '@stable'
-    'frameworks/ktexteditor': '@stable'
-    'frameworks/kwidgetsaddons': '@stable'
-    'frameworks/kparts': '@stable'
-    'frameworks/kconfig': '@stable'
-    'frameworks/knotifications': '@stable'
-    'frameworks/kwindowsystem': '@stable'
-    'frameworks/karchive': '@stable'
-    'frameworks/kcrash': '@stable'
+    'frameworks/extra-cmake-modules': '@latest-kf6'
+    'frameworks/kcoreaddons': '@latest-kf6'
+    'frameworks/kdoctools': '@latest-kf6'
+    'frameworks/ki18n': '@latest-kf6'
+    'frameworks/kxmlgui': '@latest-kf6'
+    'frameworks/ktexteditor': '@latest-kf6'
+    'frameworks/kwidgetsaddons': '@latest-kf6'
+    'frameworks/kparts': '@latest-kf6'
+    'frameworks/kconfig': '@latest-kf6'
+    'frameworks/knotifications': '@latest-kf6'
+    'frameworks/kwindowsystem': '@latest-kf6'
+    'frameworks/karchive': '@latest-kf6'
+    'frameworks/kcrash': '@latest-kf6'
 
 Options:
   require-passing-tests-on: [ 'Linux', 'FreeBSD', 'Windows' ]



More information about the rkward-tracker mailing list