jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-04 12:33:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

update qt installation

Browse source
This commit is contained in:
tooomm 2026-06-28 15:19:18 +02:00 • committed by GitHub
parent fcac7493ad
commit 694a3e33fc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

27
.github/workflows/desktop-build.yml vendored
View file

@ -270,9 +270,10 @@ jobs:
make_package: 1 make_package: 1
override_target: 13 override_target: 13
package_suffix: "-macOS13_Intel" package_suffix: "-macOS13_Intel"
qt_version: 6.11.0
qt_arch: clang_64 qt_arch: clang_64
qt_modules: qtimageformats qtmultimedia qtwebsockets qt_archives: qtbase qtmultimedia qtsvg
qt_modules: qtwebsockets
qt_version: 6.11.0
soc: Intel soc: Intel
type: Release type: Release
use_ccache: 1 use_ccache: 1
@ -286,9 +287,10 @@ jobs:
cmake_generator: Ninja cmake_generator: Ninja
make_package: 1 make_package: 1
package_suffix: "-macOS14" package_suffix: "-macOS14"
qt_version: 6.11.0
qt_arch: clang_64 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 soc: Apple
type: Release type: Release
use_ccache: 1 use_ccache: 1
@ -302,9 +304,10 @@ jobs:
cmake_generator: Ninja cmake_generator: Ninja
make_package: 1 make_package: 1
package_suffix: "-macOS15" package_suffix: "-macOS15"
qt_version: 6.11.0
qt_arch: clang_64 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 soc: Apple
type: Release type: Release
use_ccache: 1 use_ccache: 1
@ -316,9 +319,10 @@ jobs:
ccache_eviction_age: 7d ccache_eviction_age: 7d
cmake_generator: Ninja cmake_generator: Ninja
qt_version: 6.11.0
qt_arch: clang_64 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 soc: Apple
type: Debug type: Debug
use_ccache: 1 use_ccache: 1
@ -332,9 +336,10 @@ jobs:
cmake_generator_platform: x64 cmake_generator_platform: x64
make_package: 1 make_package: 1
package_suffix: "-Win10" package_suffix: "-Win10"
qt_version: 6.11.0
qt_arch: win64_msvc2022_64 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 type: Release
name: ${{ matrix.os }} ${{ matrix.target }}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} name: ${{ matrix.os }} ${{ matrix.target }}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }}
@ -399,6 +404,7 @@ jobs:
uses: jurplel/install-qt-action@v4 uses: jurplel/install-qt-action@v4
with: with:
arch: ${{ matrix.qt_arch }} arch: ${{ matrix.qt_arch }}
archives: ${{ matrix.qt_archives }}
cache: false cache: false
dir: ${{ github.workspace }} dir: ${{ github.workspace }}
modules: ${{ matrix.qt_modules }} 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 # 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 aqtsource: git+https://github.com/miurahr/aqtinstall.git
arch: ${{ matrix.qt_arch }} arch: ${{ matrix.qt_arch }}
archives: ${{ matrix.qt_archives }}
cache: true cache: true
modules: ${{ matrix.qt_modules }} modules: ${{ matrix.qt_modules }}
version: ${{ steps.resolve_qt_version.outputs.version }} version: ${{ steps.resolve_qt_version.outputs.version }}