diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2022-10-17 13:18:49 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2022-10-17 13:18:49 +0200 |
| commit | e8a328034d72c56db3a2202fa990d70b5e4ea6bd (patch) | |
| tree | 3df68a10171f5ef60c34af86d7e90fda194fe0da | |
| parent | 988d6008f77ad728ea4fa911a2a103eccac4d589 (diff) | |
| parent | 21938cdace7ee19010ef073391b3b3e26a242ce8 (diff) | |
| download | mullvadvpn-e8a328034d72c56db3a2202fa990d70b5e4ea6bd.tar.xz mullvadvpn-e8a328034d72c56db3a2202fa990d70b5e4ea6bd.zip | |
Merge branch 'fix-deb-version'
| -rw-r--r-- | gui/package-lock.json | 1 | ||||
| -rw-r--r-- | gui/package.json | 1 | ||||
| -rw-r--r-- | gui/tasks/distribution.js | 14 |
3 files changed, 7 insertions, 9 deletions
diff --git a/gui/package-lock.json b/gui/package-lock.json index 8a2b182aef..903b6482c6 100644 --- a/gui/package-lock.json +++ b/gui/package-lock.json @@ -71,7 +71,6 @@ "gulp-typescript": "^5.0.1", "playwright": "^1.26.1", "prettier": "^2.2.1", - "semver": "^7.3.8", "sinon": "^14.0.1", "ts-node": "^10.9.1", "tsc-watch": "^5.0.3", diff --git a/gui/package.json b/gui/package.json index 36bc9c6013..636e9594c2 100644 --- a/gui/package.json +++ b/gui/package.json @@ -77,7 +77,6 @@ "gulp-typescript": "^5.0.1", "playwright": "^1.26.1", "prettier": "^2.2.1", - "semver": "^7.3.8", "sinon": "^14.0.1", "ts-node": "^10.9.1", "tsc-watch": "^5.0.3", diff --git a/gui/tasks/distribution.js b/gui/tasks/distribution.js index 1a54c2a93a..deb4342116 100644 --- a/gui/tasks/distribution.js +++ b/gui/tasks/distribution.js @@ -2,9 +2,7 @@ const path = require('path'); const fs = require('fs'); const builder = require('electron-builder'); const { Arch } = require('electron-builder'); -const parseSemver = require('semver/functions/parse'); const { notarize } = require('electron-notarize'); -const { version } = require('../package.json'); const { execFileSync } = require('child_process'); const noCompression = process.argv.includes('--no-compression'); @@ -415,12 +413,14 @@ function getMacArch() { // Replace '-' between components with a tilde to make the version comparison understand that // YYYY.NN-dev-HHHHHH > YYYY.NN > YYYY.NN-betaN-dev-HHHHHH > YYYY.NN-betaN. function getDebVersion() { - const { major, minor, prerelease } = parseSemver(version); - if (prerelease[0]) { - if (prerelease[0].toLowerCase().startsWith('beta')) { - return `${major}.${minor}~${prerelease[0]}`; + const [version, ...prereleaseParts] = productVersion([]).split('-'); + const [major, minor] = version.split('.'); + const prerelease = prereleaseParts.join('-'); + if (prerelease) { + if (prerelease.toLowerCase().startsWith('beta')) { + return `${major}.${minor}~${prerelease}`; } - return `${major}.${minor}-${prerelease[0]}`; + return `${major}.${minor}-${prerelease}`; } return `${major}.${minor}`; } |