Skip to content

feature: Enterprise clients now receive stable patch versions #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rello merged 2 commits into from
Jun 1, 2026
Merged

feature: Enterprise clients now receive stable patch versions #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fdd6da5
Enterprise clients now receive stable only when:
Rello Jun 1, 2026
2942df7
fix: macOS sparkle dependency
Rello Jun 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/Response.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,15 @@ private function getUpdateVersion() : array {
}

if ($this->channel === 'enterprise' && isset($enterprise)) {
if (version_compare($this->version, $enterprise['version']) === 1
&& version_compare($this->version, $stable['version']) === -1
&& $this->hasSameMajorVersion($this->version, $stable['version'])) {
Comment thread
Rello marked this conversation as resolved.
return $stable;
}
if (version_compare($this->version, $enterprise['version']) === -1 || $isMacOs) {
return $enterprise;
}
return []; // do not fall back to stable in case there is no enterprise update
return []; // Otherwise do not fall back to stable when there is no enterprise update
}

if (version_compare($this->version, $stable['version']) == -1 || $isMacOs) {
Expand All @@ -125,6 +130,10 @@ private function getUpdateVersion() : array {
return [];
}

private function hasSameMajorVersion(string $currentVersion, string $updateVersion): bool {
return explode('.', $currentVersion, 2)[0] === explode('.', $updateVersion, 2)[0];
}

private function getLegacyChannel(): ?string {
// Outdated platforms (Qt5 era):
// - macOS < 11
Expand Down
112 changes: 111 additions & 1 deletion tests/unit/ResponseTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,34 @@ public function updateDataProvider(): array
$configThrottle = $config;
$configThrottle['nextcloud']['stable']['release'] = (new \DateTime())->sub(new \DateInterval('PT6H'))->format('Y-m-d H:m');

$configEnterprisePatchFallback = $config;
$configEnterprisePatchFallback['nextcloud']['enterprise']['win32'] = [
'version' => '4.0.10',
'versionstring' => 'Nextcloud Client 4.0.10',
'downloadurl' => 'https://download.nextcloud.com/desktop/stable/Nextcloud-4.0.10-setup.exe',
];
$configEnterprisePatchFallback['nextcloud']['stable']['win32'] = [
'version' => '33.0.5',
'versionstring' => 'Nextcloud Client 33.0.5',
'downloadurl' => 'https://download.nextcloud.com/desktop/stable/Nextcloud-33.0.5-setup.exe',
];
$configEnterprisePatchFallback['nextcloud']['enterprise']['macos'] = array_merge(
$configEnterprisePatchFallback['nextcloud']['enterprise']['macos'],
[
'version' => '4.0.10',
'versionstring' => 'Nextcloud Client 4.0.10',
]
);
$configEnterprisePatchFallback['nextcloud']['stable']['macos'] = array_merge(
$configEnterprisePatchFallback['nextcloud']['stable']['macos'],
[
'version' => '33.0.5',
'versionstring' => 'Nextcloud Client 33.0.5',
'downloadurl' => 'https://download.nextcloud.com/desktop/stable/Nextcloud-33.0.5.pkg',
'sparkleDownloadUrl' => 'https://download.nextcloud.com/desktop/stable/Nextcloud-33.0.5.pkg.tbz',
]
);

return [
// #0 Update segment is already allowed
[
Expand Down Expand Up @@ -990,7 +1018,89 @@ public function updateDataProvider(): array
</item>
</channel>
</rss>'
],
],
// #43 Manually upgraded enterprise client gets stable patches from its current major version
[
'nextcloud',
'win32',
'33.0.2',
'',
'11',
'10.0.26080',
'enterprise',
false,
false,
$configEnterprisePatchFallback,
'<?xml version="1.0"?>
<owncloudclient><version>33.0.5</version><versionstring>Nextcloud Client 33.0.5</versionstring><downloadurl>https://download.nextcloud.com/desktop/stable/Nextcloud-33.0.5-setup.exe</downloadurl></owncloudclient>
'
],
// #44 Enterprise fallback does not move a manually upgraded client to another major version
[
'nextcloud',
'win32',
'32.0.2',
'',
'11',
'10.0.26080',
'enterprise',
false,
false,
$configEnterprisePatchFallback,
'<?xml version="1.0"?>
<owncloudclient/>
'
],
// #45 Manually upgraded macOS enterprise client gets stable patches via Sparkle
[
'nextcloud',
'macos',
'33.0.2',
'',
'14.0',
'22.00.00',
'enterprise',
true,
false,
$configEnterprisePatchFallback,
'<?xml version="1.0" encoding="utf-8"?>
<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" xmlns:dc="http://purl.org/dc/elements/1.1/">
<channel>
<title>Download Channel</title>
<description>Most recent changes with links to updates.</description>
<language>en</language>
<item>
<title>Nextcloud Client 33.0.5</title>
<pubDate>Wed, 13 July 16 21:07:31 +0200</pubDate>
<enclosure url="https://download.nextcloud.com/desktop/stable/Nextcloud-33.0.5.pkg.tbz" sparkle:version="33.0.5" type="application/octet-stream" sparkle:installationType="package" sparkle:edSignature="MC0CFQDmXR6biDmNVW7TvMh0bfPPTzCvtwIUCzASgpzYdi4lltOnwbFCeQwgDjY=" length="62738920"/>
<sparkle:minimumSystemVersion>11.0</sparkle:minimumSystemVersion>
<sparkle:informationalUpdate>
<sparkle:version>33.0.0</sparkle:version>
<sparkle:version>33.0.0.0</sparkle:version>
<sparkle:version>33.0.1</sparkle:version>
<sparkle:version>33.0.1.0</sparkle:version>
</sparkle:informationalUpdate>
<link>https://download.nextcloud.com/desktop/stable/Nextcloud-33.0.5.pkg</link>
</item>
</channel>
</rss>'
],
// #46 Enterprise fallback does not offer an update when the stable patch is already installed
[
'nextcloud',
'win32',
'33.0.5',
'',
'11',
'10.0.26080',
'enterprise',
false,
false,
$configEnterprisePatchFallback,
'<?xml version="1.0"?>
<owncloudclient/>
'
],
];
}

Expand Down
Loading