Revert "Fix linux builds"

This commit is contained in:
Richard Osborne
2024-12-29 10:01:32 +01:00
committed by GitHub
parent 3f5addb251
commit c6460b235a
3 changed files with 6 additions and 17 deletions

View File

@@ -18,7 +18,6 @@
"appId": "com.opennoodl.app", "appId": "com.opennoodl.app",
"afterSign": "./build/macos-notarize.js", "afterSign": "./build/macos-notarize.js",
"mac": { "mac": {
"category": "public.app-category.developer-tools",
"hardenedRuntime": true, "hardenedRuntime": true,
"entitlements": "build/entitlements.mac.plist", "entitlements": "build/entitlements.mac.plist",
"extendInfo": { "extendInfo": {
@@ -34,8 +33,7 @@
"guid": "com.opennoodl.app" "guid": "com.opennoodl.app"
}, },
"linux": { "linux": {
"target": "appimage", "target": "deb"
"category": "Development"
}, },
"protocols": { "protocols": {
"name": "opennoodl", "name": "opennoodl",
@@ -143,4 +141,4 @@
"optionalDependencies": { "optionalDependencies": {
"dmg-license": "^1.0.11" "dmg-license": "^1.0.11"
} }
} }

View File

@@ -6,7 +6,6 @@ import { BuildTarget, getDistPlatform } from './platform/build-platforms';
(async function () { (async function () {
// Inputs // Inputs
const DISABLE_SIGNING = valueToBoolean(process.env.DISABLE_SIGNING); 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; const TARGET_PLATFORM = process.env.TARGET_PLATFORM;
if (!TARGET_PLATFORM) throw new Error('TARGET_PLATFORM is falsy'); 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('@ -> packages/noodl-editor/scripts/build.ts');
console.log('--- Configuration'); console.log('--- Configuration');
console.log('> DISABLE_SIGNING: ', DISABLE_SIGNING); console.log('> DISABLE_SIGNING: ', DISABLE_SIGNING);
console.log('> BUILD_AS_DIR: ', BUILD_AS_DIR);
console.log('> TARGET_PLATFORM: ', TARGET_PLATFORM); console.log('> TARGET_PLATFORM: ', TARGET_PLATFORM);
console.log('---'); console.log('---');
@@ -41,14 +39,10 @@ import { BuildTarget, getDistPlatform } from './platform/build-platforms';
console.log('--- done!'); console.log('--- done!');
const platformName = getDistPlatform(target.platform); const platformName = getDistPlatform(target.platform);
let args = [`--${target.arch}`, `--${platformName}`]; const args = [`--${platformName}`, `--${target.arch}`].join(' ');
if (BUILD_AS_DIR === true) {
args.push('--dir');
}
const argsStr = args.join(' ');
console.log(`--- Run: 'npx electron-builder ${argsStr}' ...`); console.log(`--- Run: 'npx electron-builder ${args}' ...`);
execSync('npx electron-builder ' + argsStr, { execSync('npx electron-builder ' + args, {
stdio: [0, 1, 2], stdio: [0, 1, 2],
env: Object.assign( env: Object.assign(
DISABLE_SIGNING DISABLE_SIGNING

View File

@@ -52,10 +52,7 @@ const regexList: RegExp[] = [
/* MacOS */ /* MacOS */
/.*\.dmg$/, /.*\.dmg$/,
/.*\.blockmap$/, /.*\.blockmap$/
/* Linux */
/.*\.AppImage$/,
]; ];
fs.mkdirSync(destinationFolder, { recursive: true }); fs.mkdirSync(destinationFolder, { recursive: true });