CringeStudios/element-desktop
5
0
Fork 0
mirror of https://github.com/CringeStudios/element-desktop.git synced 2025-01-31 05:29:58 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix accidental change of nightly deb name (#977)

Browse Source 
* Fix accidental change of nightly deb name

* Remove stale deb-custom-control arg
This commit is contained in:
Michael Telatynski 2023-05-18 19:49:45 +01:00 committed by GitHub
parent 4fa44d6942
commit e834f4a108
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/build_linux.yaml vendored
View File

@ -122,8 +122,7 @@ jobs:
run: | run: |
npx ts-node scripts/generate-builder-config.ts \ npx ts-node scripts/generate-builder-config.ts \
${{ steps.nightly.outputs.config-args }} \ ${{ steps.nightly.outputs.config-args }} \
${{ steps.debian.outputs.config-args }} \ ${{ steps.debian.outputs.config-args }}
--deb-custom-control=debcontrol
yarn build --publish never -l --config electron-builder.json ${{ steps.config.outputs.build-args }} yarn build --publish never -l --config electron-builder.json ${{ steps.config.outputs.build-args }}
- name: Check native libraries - name: Check native libraries

6
scripts/generate-builder-config.ts
View File

@ -25,6 +25,7 @@ const ELECTRON_BUILDER_CFG_FILE = "electron-builder.json";
const NIGHTLY_APP_ID = "im.riot.nightly"; const NIGHTLY_APP_ID = "im.riot.nightly";
const NIGHTLY_APP_NAME = "element-desktop-nightly"; const NIGHTLY_APP_NAME = "element-desktop-nightly";
const NIGHTLY_DEB_NAME = "element-nightly";
const argv = parseArgs<{ const argv = parseArgs<{
"nightly"?: string; "nightly"?: string;
@ -65,11 +66,14 @@ async function main(): Promise<number | void> {
}, },
}; };
if (!cfg.deb!.fpm) cfg.deb!.fpm = [];
if (argv.nightly) { if (argv.nightly) {
cfg.appId = NIGHTLY_APP_ID; cfg.appId = NIGHTLY_APP_ID;
cfg.extraMetadata!.productName += " Nightly"; cfg.extraMetadata!.productName += " Nightly";
cfg.extraMetadata!.name = NIGHTLY_APP_NAME; cfg.extraMetadata!.name = NIGHTLY_APP_NAME;
cfg.extraMetadata!.description += " (nightly unstable build)"; cfg.extraMetadata!.description += " (nightly unstable build)";
cfg.deb!.fpm!.push("--name", NIGHTLY_DEB_NAME);
let version = argv.nightly; let version = argv.nightly;
if (os.platform() === "win32") { if (os.platform() === "win32") {
@ -82,7 +86,6 @@ async function main(): Promise<number | void> {
} }
cfg.extraMetadata!.version = version; cfg.extraMetadata!.version = version;
} else { } else {
if (!cfg.deb!.fpm) cfg.deb!.fpm = [];
cfg.deb!.fpm!.push("--deb-field", "Replaces: riot-desktop (<< 1.7.0), riot-web (<< 1.7.0)"); cfg.deb!.fpm!.push("--deb-field", "Replaces: riot-desktop (<< 1.7.0), riot-web (<< 1.7.0)");
cfg.deb!.fpm!.push("--deb-field", "Breaks: riot-desktop (<< 1.7.0), riot-web (<< 1.7.0)"); cfg.deb!.fpm!.push("--deb-field", "Breaks: riot-desktop (<< 1.7.0), riot-web (<< 1.7.0)");
} }
@ -104,7 +107,6 @@ async function main(): Promise<number | void> {
cfg.extraMetadata!.productName = cfg.extraMetadata!.productName!.replace(/ /g, "-"); cfg.extraMetadata!.productName = cfg.extraMetadata!.productName!.replace(/ /g, "-");
if (argv["deb-changelog"]) { if (argv["deb-changelog"]) {
if (!cfg.deb!.fpm) cfg.deb!.fpm = [];
cfg.deb!.fpm!.push(`--deb-changelog=${argv["deb-changelog"]}`); cfg.deb!.fpm!.push(`--deb-changelog=${argv["deb-changelog"]}`);
} }