aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Handle Release Channels better as we host more packages now (#3922)

Browse source
This commit is contained in:
Zach H 2020-03-26 13:41:38 -04:00 committed by GitHub
parent e8d5715f7a
commit a135ad064a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
cockatrice/src/releasechannel.cpp
View file

@ -7,6 +7,8 @@
#include <QJsonObject>
#include <QMessageBox>
#include <QNetworkReply>
#include <QSysInfo>
#include <QtGlobal>
#define STABLERELEASE_URL "https://api.github.com/repos/Cockatrice/Cockatrice/releases/latest"
#define STABLEMANUALDOWNLOAD_URL "https://github.com/Cockatrice/Cockatrice/releases/latest"
@ -39,41 +41,45 @@ void ReleaseChannel::checkForUpdates()
connect(response, SIGNAL(finished()), this, SLOT(releaseListFinished()));
}
// Different release channel checking functions for different operating systems
#if defined(Q_OS_OSX)
bool ReleaseChannel::downloadMatchesCurrentOS(const QString &fileName)
{
return fileName.endsWith(".dmg");
const int mac_os_version = QSysInfo::productVersion().split(".")[1].toInt();
// TODO: If we change macOS builds, this must be updated
if (mac_os_version <= 12) {
// We no longer compile files for macOS 10.12 Sierra or older
return false;
} else if (mac_os_version == 13) {
// We support 10.13 High Sierra
return fileName.contains("macos10.13");
} else if (14 <= mac_os_version && mac_os_version <= 15) {
// We support 10.14 Mojave, and 10.15 Catalina
return fileName.contains("macos10.14");
} else {
// Future Mac releases we haven't heard of or accounted for yet
return (!fileName.contains("macos10.13") && !fileName.contains("macos10.14") && fileName.contains("macos"));
}
}
#elif defined(Q_OS_WIN)
#include <QSysInfo>
bool ReleaseChannel::downloadMatchesCurrentOS(const QString &fileName)
{
QString wordSize = QSysInfo::buildAbi().split('-')[2];
QString arch;
if (wordSize == "llp64") {
arch = "win64";
} else if (wordSize == "ilp32") {
arch = "win32";
} else {
qWarning() << "Error checking for upgrade version: wordSize is" << wordSize;
return false;
}
auto exeName = arch + ".exe";
return (fileName.endsWith(exeName));
#if Q_PROCESSOR_WORDSIZE == 4
return fileName.contains("win32");
#elif Q_PROCESSOR_WORDSIZE == 8
return fileName.contains("win64");
#else
return false;
#endif
}
#else
bool ReleaseChannel::downloadMatchesCurrentOS(const QString &)
{
// If the OS doesn't fit one of the above #defines, then it will never match
return false;
}
#endif
QString StableReleaseChannel::getManualDownloadUrl() const