chore: Add QT6 linux build to CI

AntiMicroX · Apr 19, 2024 · 7f695d7 · 7f695d7
1 parent 31dc69e
commit 7f695d7
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -12,32 +12,42 @@ on:
         branches:
             - master
     workflow_dispatch:
-
+#  qt6-tools-dev linguist-qt6
 jobs:
     # Build job for Ubuntu
     build-ubuntu:
         strategy:
             fail-fast: false
             matrix:
                 include:
-                    - name: Ubuntu 22-04 GCC
+                    - name: Ubuntu 22-04 GCC QT5
+                      image: ubuntu-22.04
+                      cc: gcc
+                      cxx: g++
+                      build-type: Debug
+                      experimental: false
+                      qt-packages: "qttools5-dev qttools5-dev-tools"
+                    - name: Ubuntu 22-04 GCC QT6
                       image: ubuntu-22.04
                       cc: gcc
                       cxx: g++
                       build-type: Debug
                       experimental: false
-                    - name: Ubuntu 22-04 Clang
+                      qt-packages: "qt6-base-dev qt6-tools-dev-tools libqt6core5compat6-dev qt6-l10n-tools linguist-qt6"
+                    - name: Ubuntu 22-04 Clang QT5
                       image: ubuntu-22.04
                       cc: clang
                       cxx: clang++
                       build-type: Debug
                       experimental: true
+                      qt-packages: "qttools5-dev qttools5-dev-tools"
                     - name: Ubuntu 20-04 GCC  (for AppImage comp)
                       image: ubuntu-20.04
                       cc: gcc
                       cxx: g++
                       build-type: Debug
                       experimental: false
+                      qt-packages: "qttools5-dev qttools5-dev-tools"
 
         name: ${{ matrix.name }} ${{ matrix.build-type }}
         runs-on: ${{ matrix.image }}
@@ -47,7 +57,7 @@ jobs:
             - uses: actions/checkout@v3
 
             - name: Install Dependencies
-              run: sudo apt-get update && sudo apt-get install extra-cmake-modules qttools5-dev qttools5-dev-tools libsdl2-dev libxi-dev libxtst-dev libx11-dev itstool gettext ninja-build
+              run: sudo apt-get update && sudo apt-get install extra-cmake-modules libsdl2-dev libxi-dev libxtst-dev libx11-dev itstool gettext ninja-build ${{ matrix.qt-packages }}
 
             - name: Configure CMake
               run: cmake -GNinja -DCHECK_FOR_UPDATES=ON -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -B ${{ github.workspace }}/build