From 3a3851f53efbd38a13b1e50001f4e2afe8c1c01c Mon Sep 17 00:00:00 2001 From: Martin Schwan Date: Thu, 29 Jan 2026 11:21:21 +0100 Subject: [PATCH 1/2] workflows: Update to Ubuntu 24.04 Update workflow to use latest Ubuntu LTS and adjust the installed dependencies accordingly. Signed-off-by: Martin Schwan --- .github/workflows/build.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b3cbcfb..9a4c1a3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,16 +9,13 @@ on: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v3 - name: Install build dependencies run: | sudo apt-get update - sudo apt-get install qt6-base-dev qt6-declarative-dev qt6-multimedia-dev - # Ubuntu 22.04 contains meson 0.61, which is incompatible with Qt6.1 - # and later, so install a recent version using pip instead - sudo pip3 install meson ninja + sudo apt-get install meson ninja-build qt6-base-dev qt6-declarative-dev qt6-multimedia-dev - name: Build application using Meson Build System run: | meson setup build-meson --buildtype=release From 2441c737a1932ed48e872bfc92cd1f476abb46d0 Mon Sep 17 00:00:00 2001 From: Martin Schwan Date: Thu, 29 Jan 2026 11:22:18 +0100 Subject: [PATCH 2/2] workflows: Also build with CMake Also build with CMake to verify the CMakeLists.txt file. Signed-off-by: Martin Schwan --- .github/workflows/build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9a4c1a3..cbb2728 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,11 +15,15 @@ jobs: - name: Install build dependencies run: | sudo apt-get update - sudo apt-get install meson ninja-build qt6-base-dev qt6-declarative-dev qt6-multimedia-dev + sudo apt-get install meson cmake ninja-build qt6-base-dev qt6-declarative-dev qt6-multimedia-dev - name: Build application using Meson Build System run: | meson setup build-meson --buildtype=release meson compile -C build-meson + - name: Build application using CMake + run: | + cmake -S . -B build-cmake + cmake --build build-cmake - name: Build application using qmake run: | mkdir build-qmake