diff options
author | Ivan Komissarov <abbapoh@gmail.com> | 2021-05-12 16:35:16 +0200 |
---|---|---|
committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-05-18 08:37:37 +0000 |
commit | 287311ed774a86ef9ce053dd42e947cd28b48495 (patch) | |
tree | b3fe3f16a83920df60d275411251e22de590bd57 /.github/workflows/main.yml | |
parent | b1ccd9ab328cc7f7e34ab653ec93f389b9945e19 (diff) |
cmake: Add Qt6 build
Also, switch Linux CMake job to build Qbs with Qt6
Change-Id: I188845a7cc086a8c87dbb7445ea95f99b26d94ef
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to '.github/workflows/main.yml')
-rw-r--r-- | .github/workflows/main.yml | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b15885b8a..dde93af8e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -62,18 +62,20 @@ jobs: - { name: 'Build on Linux (clang_tidy)', script: './scripts/run-analyzer.sh', + image: 'focal', options: 'profile:qt-clang_64 modules.cpp.compilerWrapper:ccache', cacheid: 'clang', } - { name: 'Build on Linux (CMake)', script: './scripts/build-qbs-with-cmake.sh', - options: '-DQBS_USE_BUNDLED_QT_SCRIPT=1', + image: 'focal-qt6', cacheid: 'cmake', } - { name: 'Build on Linux (QMake)', script: './scripts/build-qbs-with-qmake.sh', + image: 'focal', options: 'CONFIG+=ccache', cacheid: 'qmake', } @@ -96,13 +98,13 @@ jobs: key: ${{ runner.os }}-${{ matrix.config.cacheid }}-ccache-${{ steps.get-timestamp.outputs.timestamp }} restore-keys: ${{ runner.os }}-${{ matrix.config.cacheid }}-ccache- - name: Pull the Focal Image - run: docker-compose pull focal + run: docker-compose pull ${{ matrix.config.image }} - name: Print ccache stats - run: docker-compose run focal ccache -s + run: docker-compose run ${{ matrix.config.image }} ccache -s - name: Build Qbs - run: docker-compose run focal ${{ matrix.config.script }} + run: docker-compose run ${{ matrix.config.image }} ${{ matrix.config.script }} - name: Print ccache stats - run: docker-compose run focal ccache -s + run: docker-compose run ${{ matrix.config.image }} ccache -s build-macos: name: Build on macOS |