diff options
| author | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2022-06-17 10:40:49 +0200 |
|---|---|---|
| committer | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2022-06-17 10:41:15 +0200 |
| commit | 2504e6e5f216e34fc9aabfda0c462b1b37620a5e (patch) | |
| tree | 5d9baebf09da0b03c198078d82a4f7438c42a3a3 /.github/workflows | |
| parent | f779b235ddac990d17a9a8d8dd222b9e0e7abd49 (diff) | |
| download | libquotient-2504e6e5f216e34fc9aabfda0c462b1b37620a5e.tar.gz libquotient-2504e6e5f216e34fc9aabfda0c462b1b37620a5e.zip | |
Further fix building with Qt 6
Also: build with Qt 6 first, so that it fails sooner.
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/ci.yml | 5 |
1 files changed, 3 insertions, 2 deletions
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 |