mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-06-11 08:34:52 -07:00
build: use qt 6.10 on macOS and win10 (#6491)
* build: use qt 6.8.* LTS in Windows 10 and macOS * bump msvc * bump to 6.10 * reset style to the default instead of the first key --------- Co-authored-by: ebbit1q <ebbit1q@gmail.com>
This commit is contained in:
parent
f0da3cff40
commit
71cf3fabbf
1 changed files with 6 additions and 6 deletions
12
.github/workflows/desktop-build.yml
vendored
12
.github/workflows/desktop-build.yml
vendored
|
|
@ -260,7 +260,7 @@ jobs:
|
||||||
make_package: 1
|
make_package: 1
|
||||||
package_suffix: "-macOS13_Intel"
|
package_suffix: "-macOS13_Intel"
|
||||||
artifact_name: macOS13_Intel-package
|
artifact_name: macOS13_Intel-package
|
||||||
qt_version: 6.6.*
|
qt_version: 6.10.*
|
||||||
qt_arch: clang_64
|
qt_arch: clang_64
|
||||||
qt_modules: qtimageformats qtmultimedia qtwebsockets
|
qt_modules: qtimageformats qtmultimedia qtwebsockets
|
||||||
cmake_generator: Ninja
|
cmake_generator: Ninja
|
||||||
|
|
@ -275,7 +275,7 @@ jobs:
|
||||||
make_package: 1
|
make_package: 1
|
||||||
package_suffix: "-macOS14"
|
package_suffix: "-macOS14"
|
||||||
artifact_name: macOS14-package
|
artifact_name: macOS14-package
|
||||||
qt_version: 6.6.*
|
qt_version: 6.10.*
|
||||||
qt_arch: clang_64
|
qt_arch: clang_64
|
||||||
qt_modules: qtimageformats qtmultimedia qtwebsockets
|
qt_modules: qtimageformats qtmultimedia qtwebsockets
|
||||||
cmake_generator: Ninja
|
cmake_generator: Ninja
|
||||||
|
|
@ -290,7 +290,7 @@ jobs:
|
||||||
make_package: 1
|
make_package: 1
|
||||||
package_suffix: "-macOS15"
|
package_suffix: "-macOS15"
|
||||||
artifact_name: macOS15-package
|
artifact_name: macOS15-package
|
||||||
qt_version: 6.6.*
|
qt_version: 6.10.*
|
||||||
qt_arch: clang_64
|
qt_arch: clang_64
|
||||||
qt_modules: qtimageformats qtmultimedia qtwebsockets
|
qt_modules: qtimageformats qtmultimedia qtwebsockets
|
||||||
cmake_generator: Ninja
|
cmake_generator: Ninja
|
||||||
|
|
@ -302,7 +302,7 @@ jobs:
|
||||||
soc: Apple
|
soc: Apple
|
||||||
xcode: "16.4"
|
xcode: "16.4"
|
||||||
type: Debug
|
type: Debug
|
||||||
qt_version: 6.6.*
|
qt_version: 6.10.*
|
||||||
qt_arch: clang_64
|
qt_arch: clang_64
|
||||||
qt_modules: qtimageformats qtmultimedia qtwebsockets
|
qt_modules: qtimageformats qtmultimedia qtwebsockets
|
||||||
cmake_generator: Ninja
|
cmake_generator: Ninja
|
||||||
|
|
@ -327,8 +327,8 @@ jobs:
|
||||||
make_package: 1
|
make_package: 1
|
||||||
package_suffix: "-Win10"
|
package_suffix: "-Win10"
|
||||||
artifact_name: Windows10-installer
|
artifact_name: Windows10-installer
|
||||||
qt_version: 6.6.*
|
qt_version: 6.10.*
|
||||||
qt_arch: win64_msvc2019_64
|
qt_arch: win64_msvc2022_64
|
||||||
qt_modules: qtimageformats qtmultimedia qtwebsockets
|
qt_modules: qtimageformats qtmultimedia qtwebsockets
|
||||||
cmake_generator: "Visual Studio 17 2022"
|
cmake_generator: "Visual Studio 17 2022"
|
||||||
cmake_generator_platform: x64
|
cmake_generator_platform: x64
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue