summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2022-04-28 16:35:21 +0200
committerDavid Lönnhager <david.l@mullvad.net>2022-04-29 10:23:42 +0200
commit6c4f591c84fa8aa4e691b636976f9f76457c274c (patch)
tree45fbbe8695ff0f9809f4fef6671cd60acff5b957
parent3e9516b93fe16f63c83abdf886c186c6dc230e93 (diff)
downloadmullvadvpn-6c4f591c84fa8aa4e691b636976f9f76457c274c.tar.xz
mullvadvpn-6c4f591c84fa8aa4e691b636976f9f76457c274c.zip
Treat dev version deb packages as newer, all else equal
-rw-r--r--gui/tasks/distribution.js11
1 files changed, 6 insertions, 5 deletions
diff --git a/gui/tasks/distribution.js b/gui/tasks/distribution.js
index a84269568d..24e3430b9e 100644
--- a/gui/tasks/distribution.js
+++ b/gui/tasks/distribution.js
@@ -343,15 +343,16 @@ function getMacArch() {
}
// Replace '-' between components with a tilde to make the version comparison understand that
-// YYYY.NN > YYYY.NN-betaN > YYYY.NN-betaN-dev-HHHHHH.
+// YYYY.NN-dev-HHHHHH > YYYY.NN > YYYY.NN-betaN-dev-HHHHHH > YYYY.NN-betaN.
function getDebVersion() {
const { major, minor, prerelease } = parseSemver(version);
- const versionParts = [`${major}.${minor}`];
if (prerelease[0]) {
- // Replace first '-' with a '~' since the first one is the one between 'betaN' and 'dev-hash'.
- versionParts.push(prerelease[0].replace('-', '~'));
+ if (prerelease[0].toLowerCase().startsWith('beta')) {
+ return `${major}.${minor}~${prerelease[0]}`;
+ }
+ return `${major}.${minor}-${prerelease[0]}`;
}
- return versionParts.join('~');
+ return `${major}.${minor}`;
}
packWin.displayName = 'builder-win';