From 2504e6e5f216e34fc9aabfda0c462b1b37620a5e Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Fri, 17 Jun 2022 10:40:49 +0200
Subject: Further fix building with Qt 6

Also: build with Qt 6 first, so that it fails sooner.
---
 .github/workflows/ci.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ab581238..f03af94b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
       max-parallel: 1
       matrix:
         os: [ ubuntu-20.04, macos-10.15 ]
-        qt-version: [ '5.15.2', '6.3.1' ]
+        qt-version: [ '6.3.1', '5.15.2' ]
         compiler: [ LLVM ]
         # Not using binary values here, to make the job captions more readable
         e2ee: [ '', e2ee ]
@@ -105,7 +105,8 @@ jobs:
                     -DBUILD_SHARED_LIBS=${{ runner.os == 'Linux' }} \
                     -DCMAKE_INSTALL_PREFIX=~/.local \
                     -DCMAKE_PREFIX_PATH=~/.local \
-                    -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON"
+                    -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON \
+                    -DBUILD_WITH_QT6=${{ startsWith(matrix.qt-version, '6') }}"
 
         if [ '${{ matrix.static-analysis }}' == 'sonar' ]; then
             mkdir -p $HOME/.sonar
-- 
cgit v1.2.3