From 694a3e33fc3fecba74afb4c9c1c4eb72ae16e72f Mon Sep 17 00:00:00 2001 From: tooomm Date: Sun, 28 Jun 2026 15:19:18 +0200 Subject: [PATCH 1/3] update qt installation --- .github/workflows/desktop-build.yml | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml index a6b9d5340..627462e66 100644 --- a/.github/workflows/desktop-build.yml +++ b/.github/workflows/desktop-build.yml @@ -270,9 +270,10 @@ jobs: make_package: 1 override_target: 13 package_suffix: "-macOS13_Intel" - qt_version: 6.11.0 qt_arch: clang_64 - qt_modules: qtimageformats qtmultimedia qtwebsockets + qt_archives: qtbase qtmultimedia qtsvg + qt_modules: qtwebsockets + qt_version: 6.11.0 soc: Intel type: Release use_ccache: 1 @@ -286,9 +287,10 @@ jobs: cmake_generator: Ninja make_package: 1 package_suffix: "-macOS14" - qt_version: 6.11.0 qt_arch: clang_64 - qt_modules: qtimageformats qtmultimedia qtwebsockets + qt_archives: qtbase qtimageformats qtmultimedia qtsvg + qt_modules: qtwebsockets + qt_version: 6.11.0 soc: Apple type: Release use_ccache: 1 @@ -302,9 +304,10 @@ jobs: cmake_generator: Ninja make_package: 1 package_suffix: "-macOS15" - qt_version: 6.11.0 qt_arch: clang_64 - qt_modules: qtimageformats qtmultimedia qtwebsockets + qt_archives: qtbase qtimageformats qtmultimedia qtsvg qttools + qt_modules: qtwebsockets + qt_version: 6.11.0 soc: Apple type: Release use_ccache: 1 @@ -316,9 +319,10 @@ jobs: ccache_eviction_age: 7d cmake_generator: Ninja - qt_version: 6.11.0 qt_arch: clang_64 - qt_modules: qtimageformats qtmultimedia qtwebsockets + qt_archives: qtbase qtimageformats qtmultimedia qtsvg qttools + qt_modules: qtwebsockets + qt_version: 6.11.0 soc: Apple type: Debug use_ccache: 1 @@ -332,9 +336,10 @@ jobs: cmake_generator_platform: x64 make_package: 1 package_suffix: "-Win10" - qt_version: 6.11.0 qt_arch: win64_msvc2022_64 - qt_modules: qtimageformats qtmultimedia qtwebsockets + qt_archives: qtbase qtimageformats qtmultimedia qtsvg qttools + qt_modules: qtwebsockets + qt_version: 6.11.0 type: Release name: ${{ matrix.os }} ${{ matrix.target }}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} @@ -399,6 +404,7 @@ jobs: uses: jurplel/install-qt-action@v4 with: arch: ${{ matrix.qt_arch }} + archives: ${{ matrix.qt_archives }} cache: false dir: ${{ github.workspace }} modules: ${{ matrix.qt_modules }} @@ -422,6 +428,7 @@ jobs: # Qt 6.11.0 only works with aqtinstall directly from git until aqtinstall 3.4 is released aqtsource: git+https://github.com/miurahr/aqtinstall.git arch: ${{ matrix.qt_arch }} + archives: ${{ matrix.qt_archives }} cache: true modules: ${{ matrix.qt_modules }} version: ${{ steps.resolve_qt_version.outputs.version }} From fdf2c3903f57682e7aec01687d200f172324099b Mon Sep 17 00:00:00 2001 From: tooomm Date: Sun, 28 Jun 2026 15:23:53 +0200 Subject: [PATCH 2/3] qttranslations --- .github/workflows/desktop-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml index 627462e66..dbac18cab 100644 --- a/.github/workflows/desktop-build.yml +++ b/.github/workflows/desktop-build.yml @@ -320,7 +320,7 @@ jobs: ccache_eviction_age: 7d cmake_generator: Ninja qt_arch: clang_64 - qt_archives: qtbase qtimageformats qtmultimedia qtsvg qttools + qt_archives: qtbase qtimageformats qtmultimedia qtsvg qttools qttranslations qt_modules: qtwebsockets qt_version: 6.11.0 soc: Apple From 586c2f1e7d0d4eb8ac5ee4a901bdf42ef6ee998a Mon Sep 17 00:00:00 2001 From: tooomm Date: Sun, 28 Jun 2026 15:40:01 +0200 Subject: [PATCH 3/3] longer list --- .github/workflows/desktop-build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml index dbac18cab..e18892fa5 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_arch: clang_64 - qt_archives: qtbase qtmultimedia qtsvg + qt_archives: qtbase qtimageformats qtmultimedia qtsvg qttools qttranslations qt_modules: qtwebsockets qt_version: 6.11.0 soc: Intel @@ -288,7 +288,7 @@ jobs: make_package: 1 package_suffix: "-macOS14" qt_arch: clang_64 - qt_archives: qtbase qtimageformats qtmultimedia qtsvg + qt_archives: qtbase qtimageformats qtmultimedia qtsvg qttools qttranslations qt_modules: qtwebsockets qt_version: 6.11.0 soc: Apple @@ -305,7 +305,7 @@ jobs: make_package: 1 package_suffix: "-macOS15" qt_arch: clang_64 - qt_archives: qtbase qtimageformats qtmultimedia qtsvg qttools + qt_archives: qtbase qtimageformats qtmultimedia qtsvg qttools qttranslations qt_modules: qtwebsockets qt_version: 6.11.0 soc: Apple @@ -337,7 +337,7 @@ jobs: make_package: 1 package_suffix: "-Win10" qt_arch: win64_msvc2022_64 - qt_archives: qtbase qtimageformats qtmultimedia qtsvg qttools + qt_archives: qtbase qtimageformats qtmultimedia qtsvg qttools qttranslations qt_modules: qtwebsockets qt_version: 6.11.0 type: Release