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: "Can't reconcile two non-macho files" due to new "PreGyp Copy" functionality in electron/rebuild integration #7519

Merged
merged 12 commits into from
Apr 5, 2023

Conversation

mmaietta
Copy link
Collaborator

@mmaietta mmaietta commented Apr 4, 2023

Fixes: #7512 7512

@changeset-bot
Copy link

changeset-bot bot commented Apr 4, 2023

🦋 Changeset detected

Latest commit: fa92d64

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 8 packages
Name Type
app-builder-lib Patch
electron-builder Patch
dmg-builder Patch
electron-builder-squirrel-windows Patch
electron-forge-maker-appimage Patch
electron-forge-maker-nsis-web Patch
electron-forge-maker-nsis Patch
electron-forge-maker-snap Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@netlify
Copy link

netlify bot commented Apr 4, 2023

Deploy Preview for car-park-attendant-cleat-11576 ready!

Name Link
🔨 Latest commit fa92d64
🔍 Latest deploy log https://app.netlify.com/sites/car-park-attendant-cleat-11576/deploys/642cb7699e9fa60008f28ce7
😎 Deploy Preview https://deploy-preview-7519--car-park-attendant-cleat-11576.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

log.info({ arch, version: frameworkInfo.version, appDir }, "executing @electron/rebuild")
const rootPath = await searchModule.getProjectRootPath(appDir)
const options: electronRebuild.RebuildOptions = {
buildPath: appDir,
electronVersion: frameworkInfo.version,
arch,
debug: log.isDebugEnabled,
arch: Arch[arch],
projectRootPath: rootPath,
Copy link
Contributor

@sandeep1995 sandeep1995 Apr 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also add a different cachePath argument for different arch?

https://github.com/electron/rebuild/blob/main/src/types.ts#L10

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What for? Why can't the default cache be used?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

"Can't reconcile two non-macho files" after upgrading to 24.x.x
2 participants