diff options
| author | David Lönnhager <david.l@mullvad.net> | 2022-04-29 10:24:29 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2022-04-29 10:24:29 +0200 |
| commit | 661bc50d67ef36e3a7f826cda5fd82568ba95a84 (patch) | |
| tree | 45fbbe8695ff0f9809f4fef6671cd60acff5b957 | |
| parent | 3e9516b93fe16f63c83abdf886c186c6dc230e93 (diff) | |
| parent | 6c4f591c84fa8aa4e691b636976f9f76457c274c (diff) | |
| download | mullvadvpn-661bc50d67ef36e3a7f826cda5fd82568ba95a84.tar.xz mullvadvpn-661bc50d67ef36e3a7f826cda5fd82568ba95a84.zip | |
Merge branch 'fix-deb-version'
| -rw-r--r-- | gui/tasks/distribution.js | 11 |
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'; |
