jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-03 20:13:56 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

construct package_suffix var from existing values and adjust updater

Browse source
This commit is contained in:
tooomm 2026-07-03 18:36:34 +02:00
parent dc08e963e6
commit 62dc1c29f5
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -267,7 +267,6 @@ jobs:
cmake_generator: Ninja
make_package: true
override_target: 13
package_suffix: "-macOS13_Intel"
qt_version: 6.11.0
qt_arch: clang_64
qt_modules: qtimageformats qtmultimedia qtwebsockets
@ -282,7 +281,6 @@ jobs:
cmake_generator: Ninja
make_package: true
package_suffix: "-macOS14"
qt_version: 6.11.0
qt_arch: clang_64
qt_modules: qtimageformats qtmultimedia qtwebsockets
@ -297,7 +295,6 @@ jobs:
cmake_generator: Ninja
make_package: true
package_suffix: "-macOS15"
qt_version: 6.11.0
qt_arch: clang_64
qt_modules: qtimageformats qtmultimedia qtwebsockets
@ -326,7 +323,6 @@ jobs:
cmake_generator: "Visual Studio 18 2026"
cmake_generator_platform: x64
make_package: true
package_suffix: "-Win10"
qt_version: 6.11.0
qt_arch: win64_msvc2022_64
qt_modules: qtimageformats qtmultimedia qtwebsockets
@ -447,7 +443,7 @@ jobs:
MACOS_CERTIFICATE_PWD: ${{ secrets.PROD_MACOS_CERTIFICATE_PWD }}
MACOS_CI_KEYCHAIN_PWD: ${{ secrets.PROD_MACOS_CI_KEYCHAIN_PWD }}
MAKE_PACKAGE: ${{ matrix.make_package }}
PACKAGE_SUFFIX: ${{ matrix.package_suffix }}
PACKAGE_SUFFIX: '-${{ matrix.os }}${{ matrix.os_target_version }}${{ case(matrix.soc == 'Intel', '_Intel', '') }}'
TARGET_MACOS_VERSION: ${{ matrix.override_target }}
USE_CCACHE: ${{ matrix.use_ccache }}
VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite'

4
cockatrice/src/client/network/update/client/release_channel.cpp
View file

@ -79,9 +79,9 @@ bool ReleaseChannel::downloadMatchesCurrentOS(const QString &fileName)
#elif Q_PROCESSOR_WORDSIZE == 8
const QString &version = QSysInfo::productVersion();
if (version.startsWith("7") || version.startsWith("8")) {
return fileName.contains("Win7");
return fileName.contains("Win7") || fileName.contains("Windows7");
} else {
return fileName.contains("Win10");
return fileName.contains("Win10") || fileName.contains("Windows10");
}
#else
Q_UNUSED(fileName);