CI-unixish-docker.yml: include GUI in CMake build on latest ubuntu

danmar · Sep 14, 2023 · 347eaab · 347eaab
1 parent c71ef1d
commit 347eaab
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/.github/workflows/CI-unixish-docker.yml b/.github/workflows/CI-unixish-docker.yml
@@ -48,11 +48,10 @@ jobs:
           apt-get update
           apt-get install -y cmake g++ make libxml2-utils libpcre3-dev
 
-      # required so a default Qt installation is configured
-      - name: Install missing software on ubuntu 18.04
-        if: false # matrix.os == 'ubuntu-18.04'
+      - name: Install missing software on ubuntu 23.04
+        if: matrix.os == 'ubuntu:23.04'
         run: |
-          sudo apt-get install qt5-default
+          sudo apt-get install qt6-base-dev qt6-charts-dev qt6-tools-dev
 
       # needs to be called after the package installation since
       # - it doesn't call "apt-get update"
@@ -82,13 +81,19 @@ jobs:
           cmake --build . -- -j$(nproc)
 
       - name: CMake build
-        if: matrix.image != 'centos:7' && matrix.image != 'ubuntu:14.04' && matrix.image != 'ubuntu:16.04'
+        if: matrix.image != 'centos:7' && matrix.image != 'ubuntu:14.04' && matrix.image != 'ubuntu:16.04' && matrix.image != 'ubuntu:23.04'
         run: |
           mkdir cmake.output
           cd cmake.output
           cmake -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DCMAKE_DISABLE_PRECOMPILE_HEADERS=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ..
           cmake --build . -- -j$(nproc)
 
+      - name: CMake build (with GUI)
+        if: matrix.image == 'ubuntu:23.04'
+        run: |
+          cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ..
+          cmake --build cmake.output -- -j$(nproc)
+
       - name: Run CMake test
         if: matrix.image != 'centos:7' && matrix.image != 'ubuntu:14.04' && matrix.image != 'ubuntu:16.04'
         run: |