From fe0ade6013bdccc5f16cfb3ae2b971c30121edec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Thu, 30 Jul 2026 16:44:02 +0200 Subject: [PATCH] Adjust CI Took 14 minutes --- .ci/Arch/Dockerfile | 2 ++ .ci/Debian12/Dockerfile | 2 ++ .ci/Debian13/Dockerfile | 2 ++ .ci/Fedora43/Dockerfile | 2 +- .ci/Fedora44/Dockerfile | 2 +- .ci/Ubuntu24.04/Dockerfile | 2 ++ .ci/Ubuntu26.04/Dockerfile | 2 ++ .github/workflows/desktop-build.yml | 10 +++++----- 8 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.ci/Arch/Dockerfile b/.ci/Arch/Dockerfile index 36cf5c4ae..f37315262 100644 --- a/.ci/Arch/Dockerfile +++ b/.ci/Arch/Dockerfile @@ -10,8 +10,10 @@ RUN pacman --sync --refresh --sysupgrade --needed --noconfirm \ ninja \ protobuf \ qt6-base \ + qt6-declarative \ qt6-imageformats \ qt6-multimedia \ + qt6-shadertools \ qt6-svg \ qt6-tools \ qt6-translations \ diff --git a/.ci/Debian12/Dockerfile b/.ci/Debian12/Dockerfile index 202405b84..0fa227d6f 100644 --- a/.ci/Debian12/Dockerfile +++ b/.ci/Debian12/Dockerfile @@ -20,7 +20,9 @@ RUN apt-get update && \ qt6-image-formats-plugins \ qt6-l10n-tools \ qt6-multimedia-dev \ + qt6-declarative-dev \ qt6-svg-dev \ + qt6-shadertools-dev \ qt6-tools-dev \ qt6-tools-dev-tools \ qt6-websockets-dev \ diff --git a/.ci/Debian13/Dockerfile b/.ci/Debian13/Dockerfile index d7ab6ac86..13e8b35c7 100644 --- a/.ci/Debian13/Dockerfile +++ b/.ci/Debian13/Dockerfile @@ -21,7 +21,9 @@ RUN apt-get update && \ qt6-image-formats-plugins \ qt6-l10n-tools \ qt6-multimedia-dev \ + qt6-declarative-dev \ qt6-svg-dev \ + qt6-shadertools-dev \ qt6-tools-dev \ qt6-tools-dev-tools \ qt6-websockets-dev \ diff --git a/.ci/Fedora43/Dockerfile b/.ci/Fedora43/Dockerfile index 27570cf99..68e894543 100644 --- a/.ci/Fedora43/Dockerfile +++ b/.ci/Fedora43/Dockerfile @@ -8,7 +8,7 @@ RUN dnf install -y \ mariadb-devel \ ninja-build \ protobuf-devel \ - qt6-{qttools,qtsvg,qtmultimedia,qtwebsockets}-devel \ + qt6-{qtdeclarative,qtshadertools,qttools,qtsvg,qtmultimedia,qtwebsockets}-devel \ qt6-qtimageformats \ rpm-build \ xz-devel \ diff --git a/.ci/Fedora44/Dockerfile b/.ci/Fedora44/Dockerfile index e6c8da7f3..ffd7c1b9b 100644 --- a/.ci/Fedora44/Dockerfile +++ b/.ci/Fedora44/Dockerfile @@ -8,7 +8,7 @@ RUN dnf install -y \ mariadb-devel \ ninja-build \ protobuf-devel \ - qt6-{qttools,qtsvg,qtmultimedia,qtwebsockets}-devel \ + qt6-{qtdeclarative,qtshadertools,qttools,qtsvg,qtmultimedia,qtwebsockets}-devel \ qt6-qtimageformats \ rpm-build \ xz-devel \ diff --git a/.ci/Ubuntu24.04/Dockerfile b/.ci/Ubuntu24.04/Dockerfile index 809b2e43a..12320c276 100644 --- a/.ci/Ubuntu24.04/Dockerfile +++ b/.ci/Ubuntu24.04/Dockerfile @@ -20,7 +20,9 @@ RUN apt-get update && \ qt6-image-formats-plugins \ qt6-l10n-tools \ qt6-multimedia-dev \ + qt6-declarative-dev \ qt6-svg-dev \ + qt6-shadertools-dev \ qt6-tools-dev \ qt6-tools-dev-tools \ qt6-websockets-dev \ diff --git a/.ci/Ubuntu26.04/Dockerfile b/.ci/Ubuntu26.04/Dockerfile index 7b0cd389f..ce3d9cd6c 100644 --- a/.ci/Ubuntu26.04/Dockerfile +++ b/.ci/Ubuntu26.04/Dockerfile @@ -21,7 +21,9 @@ RUN apt-get update && \ qt6-image-formats-plugins \ qt6-l10n-tools \ qt6-multimedia-dev \ + qt6-declarative-dev \ qt6-svg-dev \ + qt6-shadertools-dev \ qt6-tools-dev \ qt6-tools-dev-tools \ qt6-websockets-dev \ diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml index f1846ecf6..4c1d8837e 100644 --- a/.github/workflows/desktop-build.yml +++ b/.github/workflows/desktop-build.yml @@ -271,7 +271,7 @@ jobs: override_target: 13 package_suffix: "-macOS13_Intel" qt_version: 6.11.0 - qt_modules: qtimageformats qtmultimedia qtwebsockets + qt_modules: qtimageformats qtmultimedia qtwebsockets qtdeclarative qtshadertools soc: Intel type: Release use_ccache: 1 @@ -286,7 +286,7 @@ jobs: make_package: 1 package_suffix: "-macOS14" qt_version: 6.11.0 - qt_modules: qtimageformats qtmultimedia qtwebsockets + qt_modules: qtimageformats qtmultimedia qtwebsockets qtdeclarative qtshadertools soc: Apple type: Release use_ccache: 1 @@ -301,7 +301,7 @@ jobs: make_package: 1 package_suffix: "-macOS15" qt_version: 6.11.0 - qt_modules: qtimageformats qtmultimedia qtwebsockets + qt_modules: qtimageformats qtmultimedia qtwebsockets qtdeclarative qtshadertools soc: Apple type: Release use_ccache: 1 @@ -314,7 +314,7 @@ jobs: ccache_eviction_age: 7d cmake_generator: Ninja qt_version: 6.11.0 - qt_modules: qtimageformats qtmultimedia qtwebsockets + qt_modules: qtimageformats qtmultimedia qtwebsockets qtdeclarative qtshadertools soc: Apple type: Debug use_ccache: 1 @@ -329,7 +329,7 @@ jobs: make_package: 1 package_suffix: "-Win10" qt_version: 6.11.0 - qt_modules: qtimageformats qtmultimedia qtwebsockets + qt_modules: qtimageformats qtmultimedia qtwebsockets qtdeclarative qtshadertools type: Release name: ${{ matrix.os }} ${{ matrix.target }}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }}