fixed #13788 - CI-unixish-docker.yml: replaced ubuntu:24.10 with ùbuntu:25.04 / cleanups

Author: firewave

.github/workflows/CI-unixish-docker.yml

@@ -20,20 +20,12 @@ jobs:
 
     strategy:
       matrix:
-        image: ["ubuntu:24.04", "ubuntu:24.10"]
-        include:
-          - build_gui: false
-          - image: "ubuntu:24.04"
-            build_gui: true
-          - image: "ubuntu:24.10"
-            build_gui: true
+        image: ["ubuntu:24.04", "ubuntu:25.04"]
       fail-fast: false # Prefer quick result
 
     runs-on: ubuntu-22.04
 
-    # TODO: is this actually applied to the guest?
     env:
-      # TODO: figure out why there are cache misses with PCH enabled
       CCACHE_SLOPPINESS: pch_defines,time_macros
 
     container:
@@ -51,7 +43,6 @@ jobs:
           apt-get install -y cmake g++ make libxml2-utils libpcre3-dev
 
       - name: Install missing software (gui) on latest ubuntu
-        if: matrix.build_gui
         run: |
           apt-get install -y qt6-base-dev qt6-charts-dev qt6-tools-dev
 
@@ -62,18 +53,12 @@ jobs:
         with:
           key: ${{ github.workflow }}-${{ matrix.image }}
 
-      - name: CMake build
-        if: ${{ !matrix.build_gui }}
+      - name: Run CMake (with GUI)
         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)
+          cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
 
       - name: CMake build (with GUI)
-        if: matrix.build_gui
         run: |
-          cmake -S . -B cmake.output -G "Unix Makefiles" -DHAVE_RULES=On -DBUILD_TESTS=On -DBUILD_GUI=On -DUSE_QT6=On -DWITH_QCHART=On -DBUILD_TRIAGE=On -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
           cmake --build cmake.output -- -j$(nproc)
 
       - name: Run CMake test
@@ -84,7 +69,7 @@ jobs:
 
     strategy:
       matrix:
-        image: ["ubuntu:24.04", "ubuntu:24.10"]
+        image: ["ubuntu:24.04", "ubuntu:25.04"]
       fail-fast: false # Prefer quick result
 
     runs-on: ubuntu-22.04