From a9dc4915371087e2d706fad95d4fccf11745ba63 Mon Sep 17 00:00:00 2001
From: Linus Jahn <lnj@kaidan.im>
Date: Sun, 4 Sep 2022 18:53:35 +0200
Subject: ci: Add Qt 6 builds

---
 .github/workflows/tests.yml        | 10 ++++++++--
 tests/travis/build-and-test        |  2 +-
 tests/travis/install-build-depends |  8 ++++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 45f68da2..cc1d7ebd 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -22,9 +22,15 @@ jobs:
           - os: ubuntu-latest
             config: full
             qt_version: 5.9.*
+          - os: ubuntu-latest
+            config: minimal
+            qt_version: 6.0.*
+          - os: ubuntu-latest
+            config: minimal
+            qt_version: 6.*.*
           - os: macos-latest
-            config: full
-            qt_version: 5.9.*
+            config: minimal
+            qt_version: 6.*.*
     steps:
       - uses: actions/checkout@v2
       - name: Install Qt
diff --git a/tests/travis/build-and-test b/tests/travis/build-and-test
index 400831d5..c39f1806 100755
--- a/tests/travis/build-and-test
+++ b/tests/travis/build-and-test
@@ -14,7 +14,7 @@ case "$CONFIG" in
 full*)
     CMAKE_ARGS="-DBUILD_DOCUMENTATION:BOOL=True -DBUILD_EXAMPLES:BOOL=True -DWITH_GSTREAMER:BOOL=True"
     case "$QT_VERSION" in
-    5.15*)
+    5.15* | 6*)
         # Enable OMEMO
         CMAKE_ARGS="$CMAKE_ARGS -DBUILD_OMEMO=ON"
         ;;
diff --git a/tests/travis/install-build-depends b/tests/travis/install-build-depends
index 3fa14a28..9a8b4fed 100755
--- a/tests/travis/install-build-depends
+++ b/tests/travis/install-build-depends
@@ -47,13 +47,17 @@ fi
 
 case "$CONFIG" in
 full*)
+    # Enable OMEMO for Qt > 5.15 (including Qt 6)
+    # Build and install qca and libomemo-c
     case "$QT_VERSION" in
     5.15*)
-        # OMEMO enabled
-        # Build and install qca and libomemo-c
         install_cmake libomemo-c https://github.com/dino/libomemo-c "-DBUILD_SHARED_LIBS=ON"
         install_cmake qca https://invent.kde.org/libraries/qca "-DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF -DBUILD_WITH_QT6=OFF"
         ;;
+    6*)
+        install_cmake libomemo-c https://github.com/dino/libomemo-c "-DBUILD_SHARED_LIBS=ON"
+        install_cmake qca https://invent.kde.org/libraries/qca "-DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF -DBUILD_WITH_QT6=ON"
+        ;;
     esac
     ;;
 esac
-- 
cgit v1.2.3