From c6460b235a8e0d92a86bbcbe4bc128aacfdfc25e Mon Sep 17 00:00:00 2001 From: Richard Osborne Date: Sun, 29 Dec 2024 10:01:32 +0100 Subject: [PATCH] Revert "Fix linux builds" --- packages/noodl-editor/package.json | 6 ++---- packages/noodl-editor/scripts/build.ts | 12 +++--------- scripts/build-pack.ts | 5 +---- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/packages/noodl-editor/package.json b/packages/noodl-editor/package.json index a457420..48b5835 100644 --- a/packages/noodl-editor/package.json +++ b/packages/noodl-editor/package.json @@ -18,7 +18,6 @@ "appId": "com.opennoodl.app", "afterSign": "./build/macos-notarize.js", "mac": { - "category": "public.app-category.developer-tools", "hardenedRuntime": true, "entitlements": "build/entitlements.mac.plist", "extendInfo": { @@ -34,8 +33,7 @@ "guid": "com.opennoodl.app" }, "linux": { - "target": "appimage", - "category": "Development" + "target": "deb" }, "protocols": { "name": "opennoodl", @@ -143,4 +141,4 @@ "optionalDependencies": { "dmg-license": "^1.0.11" } -} +} \ No newline at end of file diff --git a/packages/noodl-editor/scripts/build.ts b/packages/noodl-editor/scripts/build.ts index 622baf0..82cfd58 100644 --- a/packages/noodl-editor/scripts/build.ts +++ b/packages/noodl-editor/scripts/build.ts @@ -6,7 +6,6 @@ import { BuildTarget, getDistPlatform } from './platform/build-platforms'; (async function () { // Inputs const DISABLE_SIGNING = valueToBoolean(process.env.DISABLE_SIGNING); - const BUILD_AS_DIR = valueToBoolean(process.env.BUILD_AS_DIR); const TARGET_PLATFORM = process.env.TARGET_PLATFORM; if (!TARGET_PLATFORM) throw new Error('TARGET_PLATFORM is falsy'); @@ -20,7 +19,6 @@ import { BuildTarget, getDistPlatform } from './platform/build-platforms'; console.log('@ -> packages/noodl-editor/scripts/build.ts'); console.log('--- Configuration'); console.log('> DISABLE_SIGNING: ', DISABLE_SIGNING); - console.log('> BUILD_AS_DIR: ', BUILD_AS_DIR); console.log('> TARGET_PLATFORM: ', TARGET_PLATFORM); console.log('---'); @@ -41,14 +39,10 @@ import { BuildTarget, getDistPlatform } from './platform/build-platforms'; console.log('--- done!'); const platformName = getDistPlatform(target.platform); - let args = [`--${target.arch}`, `--${platformName}`]; - if (BUILD_AS_DIR === true) { - args.push('--dir'); - } - const argsStr = args.join(' '); + const args = [`--${platformName}`, `--${target.arch}`].join(' '); - console.log(`--- Run: 'npx electron-builder ${argsStr}' ...`); - execSync('npx electron-builder ' + argsStr, { + console.log(`--- Run: 'npx electron-builder ${args}' ...`); + execSync('npx electron-builder ' + args, { stdio: [0, 1, 2], env: Object.assign( DISABLE_SIGNING diff --git a/scripts/build-pack.ts b/scripts/build-pack.ts index 726f091..86bf72e 100644 --- a/scripts/build-pack.ts +++ b/scripts/build-pack.ts @@ -52,10 +52,7 @@ const regexList: RegExp[] = [ /* MacOS */ /.*\.dmg$/, - /.*\.blockmap$/, - - /* Linux */ - /.*\.AppImage$/, + /.*\.blockmap$/ ]; fs.mkdirSync(destinationFolder, { recursive: true });