CI: Re-enable FreeBSD Qt6

libsecret fix config options to match Flathub
Use git master for kirigami-addons
2025-03-06 12:44:05 +10:30 · 2025-03-03 12:31:23 +10:30 · 2025-03-03 12:17:37 +10:30 · 2025-03-03 01:46:26 +00:00 · 2025-03-03 01:46:26 +00:00 · 2025-03-03 01:46:26 +00:00
2 changed files with 42 additions and 26 deletions
--- a/.flatpak-manifest.json
+++ b/.flatpak-manifest.json
@@ -25,13 +25,23 @@
    "modules": [
        {
            "name": "kirigamiaddons",
-            "config-opts": [ "-DBUILD_TESTING=OFF" ],
+            "config-opts": [
+                "-DBUILD_TESTING=OFF"
+            ],
            "buildsystem": "cmake-ninja",
-            "sources": [ { "type": "git", "url": "https://invent.kde.org/libraries/kirigami-addons.git", "commit": "34d311219e8b7209746a98b3a29b91ded05ff936" } ]
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://invent.kde.org/libraries/kirigami-addons.git"
+                }
+            ]
        },
        {
            "name": "kquickimageeditor",
-            "config-opts": [ "-DBUILD_WITH_QT6=ON" ],
+            "config-opts": [
+                "-DBUILD_WITH_QT6=ON",
+                "-DBUILD_TESTING=OFF"
+            ],
            "buildsystem": "cmake-ninja",
            "sources": [
                {
@@ -43,17 +53,19 @@
        {
            "name": "olm",
            "buildsystem": "cmake-ninja",
-            "config-opts": [ "-DOLM_TESTS=OFF" ],
+            "config-opts": [
+                "-DOLM_TESTS=OFF"
+            ],
            "sources": [
                {
                    "type": "git",
                    "url": "https://gitlab.matrix.org/matrix-org/olm.git",
-                    "tag": "3.2.10",
+                    "tag": "3.2.16",
                    "x-checker-data": {
                        "type": "git",
                        "tag-pattern": "^([\\d.]+)$"
                    },
-                    "commit": "9908862979147a71dc6abaecd521be526ae77be1"
+                    "commit": "7e0c8277032e40308987257b711b38af8d77cc69"
                }
            ]
        },
@@ -65,13 +77,13 @@
                "-Dvapi=false",
                "-Dgtk_doc=false",
                "-Dintrospection=false",
-                "-Dgcrypt=false"
+                "-Dcrypto=disabled"
            ],
            "sources": [
                {
                    "type": "archive",
-                    "url": "https://download.gnome.org/sources/libsecret/0.20/libsecret-0.20.5.tar.xz",
-                    "sha256": "3fb3ce340fcd7db54d87c893e69bfc2b1f6e4d4b279065ffe66dac9f0fd12b4d",
+                    "url": "https://download.gnome.org/sources/libsecret/0.21/libsecret-0.21.6.tar.xz",
+                    "sha256": "747b8c175be108c880d3adfb9c3537ea66e520e4ad2dccf5dce58003aeeca090",
                    "x-checker-data": {
                        "type": "gnome",
                        "name": "libsecret",
@@ -86,13 +98,13 @@
            "sources": [
                {
                    "type": "archive",
-                    "url": "https://github.com/frankosterfeld/qtkeychain/archive/0.14.2.tar.gz",
-                    "sha256": "cf2e972b783ba66334a79a30f6b3a1ea794a1dc574d6c3bebae5ffd2f0399571",
+                    "url": "https://github.com/frankosterfeld/qtkeychain/archive/refs/tags/0.15.0.tar.gz",
+                    "sha256": "f4254dc8f0933b06d90672d683eab08ef770acd8336e44dfa030ce041dc2ca22",
                    "x-checker-data": {
                        "type": "anitya",
                        "project-id": 4138,
                        "stable-only": true,
-                        "url-template": "https://github.com/frankosterfeld/qtkeychain/archive/v$version.tar.gz"
+                        "url-template": "https://github.com/frankosterfeld/qtkeychain/archive/refs/tags/$version.tar.gz"
                    }
                }
            ],
@@ -100,7 +112,8 @@
                "-DBUILD_WITH_QT6=ON",
                "-DCMAKE_INSTALL_LIBDIR=/app/lib",
                "-DLIB_INSTALL_DIR=/app/lib",
-                "-DBUILD_TRANSLATIONS=NO"
+                "-DBUILD_TRANSLATIONS=NO",
+                "-DBUILD_TESTING=OFF"
            ]
        },
        {
@@ -123,29 +136,31 @@
        {
            "name": "cmark",
            "buildsystem": "cmake-ninja",
-            "config-opts": [ "-DCMARK_TESTS=OFF" ],
+            "config-opts": [
+                "-DCMARK_TESTS=OFF",
+                "-DCMAKE_BUILD_TYPE=Release",
+                "-DCMAKE_INSTALL_PREFIX=/app"
+            ],
            "sources": [
                {
                    "type": "git",
                    "url": "https://github.com/commonmark/cmark.git"
                }
            ],
-            "config-opts": [
-                "-DCMARK_TESTS=OFF",
-                "-DCMAKE_BUILD_TYPE=Release",
-                "-DCMAKE_INSTALL_PREFIX=/app"
-            ],
            "builddir": true
        },
        {
            "name": "qcoro",
            "buildsystem": "cmake-ninja",
-            "config-opts": [ "-DQCORO_BUILD_EXAMPLES=OFF", "-DBUILD_TESTING=OFF" ],
+            "config-opts": [
+                "-DQCORO_BUILD_EXAMPLES=OFF",
+                "-DBUILD_TESTING=OFF"
+            ],
            "sources": [
                {
                    "type": "archive",
-                    "url": "https://github.com/danvratil/qcoro/archive/refs/tags/v0.7.0.tar.gz",
-                    "sha256": "23ef0217926e67c8d2eb861cf91617da2f7d8d5a9ae6c62321b21448b1669210",
+                    "url": "https://github.com/danvratil/qcoro/archive/refs/tags/v0.11.0.tar.gz",
+                    "sha256": "9942c5b4c533192f6c5954dc6d10178b3829075e6a621b67df73f0a4b74d8297",
                    "x-checker-data": {
                        "type": "anitya",
                        "project-id": 236236,
@@ -158,14 +173,15 @@
        {
            "name": "neochat",
            "buildsystem": "cmake-ninja",
+            "config-opts": [
+                "-DBUILD_TESTING=OFF",
+                "-DNEOCHAT_FLATPAK=ON"
+            ],
            "sources": [
                {
                    "type": "dir",
                    "path": "."
                }
-            ],
-            "config-opts": [
-                "-DNEOCHAT_FLATPAK=ON"
            ]
        }
    ]
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ include:
      - /gitlab-templates/linux-qt6.yml
      - /gitlab-templates/linux-qt6-next.yml
      - /gitlab-templates/windows-qt6.yml
-      # - /gitlab-templates/freebsd-qt6.yml
+      - /gitlab-templates/freebsd-qt6.yml
      - /gitlab-templates/flatpak.yml
      - /gitlab-templates/snap-snapcraft-lxd.yml
      - /gitlab-templates/craft-android-qt6-apks.yml
Author	SHA1	Message	Date
Justin Zobel	e6484a8606	CI: Re-enable FreeBSD Qt6	2025-03-06 12:44:05 +10:30
Justin Zobel	93200f3db6	libsecret fix config options to match Flathub	2025-03-03 12:31:23 +10:30
Justin Zobel	f9997ff7ba	Use git master for kirigami-addons	2025-03-03 12:17:37 +10:30
Justin Zobel	5814e7eef2	Fix qtkeychain update check and updated to 0.15.0	2025-03-03 01:46:26 +00:00
Justin Zobel	1968196e27	Disable tests on several modules	2025-03-03 01:46:26 +00:00
Justin Zobel	2802fcf50f	Update olm to 3.2.16, libsecret to 0.21.6 and qcoro to 0.11.0	2025-03-03 01:46:26 +00:00