Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: pass in platform to electron-rebuild #8537

Merged
merged 3 commits into from
Oct 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/dirty-clocks-rhyme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"app-builder-lib": patch
"dmg-builder": patch
---

fix: pass in platform to electron-rebuild
2 changes: 1 addition & 1 deletion packages/app-builder-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"@develar/schema-utils": "~2.6.5",
"@electron/notarize": "2.5.0",
"@electron/osx-sign": "1.3.1",
"@electron/rebuild": "3.6.0",
"@electron/rebuild": "3.6.1",
"@electron/universal": "2.0.1",
"@malept/flatpak-bundler": "^0.4.0",
"@types/fs-extra": "9.0.13",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ export class WindowsSignToolManager {
}
log.info(logInfo, "signing")
} else if (!customSign) {
log.error({ signHook: customSign, cscInfo }, "no signing info identified, signing is skipped")
log.warn({ signHook: !!customSign, cscInfo }, "no signing info identified, signing is skipped")
return false
}

Expand Down
8 changes: 5 additions & 3 deletions packages/app-builder-lib/src/util/yarn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -182,15 +182,16 @@ export async function rebuild(config: Configuration, appDir: string, options: Re
execPath: process.env.npm_execpath || process.env.NPM_CLI_JS,
buildFromSource: options.buildFromSource === true,
}
const { arch, buildFromSource, platform } = configuration

if (config.nativeRebuilder === "legacy") {
const env = getGypEnv(options.frameworkInfo, configuration.platform, configuration.arch, options.buildFromSource === true)
const env = getGypEnv(options.frameworkInfo, platform, arch, buildFromSource)
return executeAppBuilderAndWriteJson(["rebuild-node-modules"], configuration, { env, cwd: appDir })
}

const {
frameworkInfo: { version: electronVersion },
} = options
const { arch, buildFromSource } = configuration
const logInfo = {
electronVersion,
arch,
Expand All @@ -203,9 +204,10 @@ export async function rebuild(config: Configuration, appDir: string, options: Re
buildPath: appDir,
electronVersion,
arch,
platform,
buildFromSource,
projectRootPath: await getProjectRootPath(appDir),
mode: (config.nativeRebuilder as RebuildMode) || "sequential",
buildFromSource: buildFromSource,
disablePreGypCopy: true,
}
return remoteRebuild(rebuildOptions)
Expand Down
2 changes: 1 addition & 1 deletion packages/dmg-builder/src/hdiuil.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export async function hdiUtil(args: string[]) {
return retry(
() => exec("hdiutil", args),
5,
1000,
5000,
2000,
0,
(error: any) => {
Expand Down
24 changes: 12 additions & 12 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading