Merge branch 'master' into dbkr/docker-env

This commit is contained in:
David Baker 2020-02-27 17:30:55 +00:00
commit f48692bddb

View file

@ -118,7 +118,7 @@ async function main() {
let targetVersion; let targetVersion;
let filename; let filename;
let url; let url;
let shouldSetPackageVersion = false; let setVersion = false;
while (process.argv.length > 2) { while (process.argv.length > 2) {
switch (process.argv[2]) { switch (process.argv[2]) {
@ -166,7 +166,7 @@ async function main() {
} else { } else {
filename = 'riot-' + targetVersion + '.tar.gz'; filename = 'riot-' + targetVersion + '.tar.gz';
url = PACKAGE_URL_PREFIX + targetVersion + '/' + filename; url = PACKAGE_URL_PREFIX + targetVersion + '/' + filename;
shouldSetPackageVersion = true; setVersion = true;
} }
const haveGpg = await new Promise((resolve) => { const haveGpg = await new Promise((resolve) => {
@ -279,15 +279,13 @@ async function main() {
console.log("Pack " + expectedDeployDir + " -> " + ASAR_PATH); console.log("Pack " + expectedDeployDir + " -> " + ASAR_PATH);
await asar.createPackage(expectedDeployDir, ASAR_PATH); await asar.createPackage(expectedDeployDir, ASAR_PATH);
if (shouldSetPackageVersion) { if (setVersion) {
const semVer = targetVersion.slice(1); const semVer = targetVersion.slice(1);
console.log("Updating package version to " + semVer); console.log("Updating version to " + semVer);
await setPackageVersion(semVer); await setPackageVersion(semVer);
await setDebVersion(semVer);
} }
console.log("Updating deb version to " + targetVersion);
await setDebVersion(targetVersion);
console.log("Done!"); console.log("Done!");
} }