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: intel mac proxy #467

Merged
merged 5 commits into from
Feb 13, 2025
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
14 changes: 13 additions & 1 deletion forge.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,18 @@ import { VitePlugin } from '@electron-forge/plugin-vite'
import { FusesPlugin } from '@electron-forge/plugin-fuses'
import { FuseV1Options, FuseVersion } from '@electron/fuses'
import { getPlatform, getArch } from './src/utils/electron'
import path from 'path'

function getPlatformSpecificResources() {
// on mac we are using a single image to build both architectures so we
// will need to include both binaries in the final package for it to work.
// Otherwise the x86_64 build will still be having the resources/arm64 only binaries
if (getPlatform() === 'mac') {
return ['./resources/mac/arm64', './resources/mac/x86_64']
}

return [path.join('./resources/', getPlatform(), getArch())]
}

const config: ForgeConfig = {
packagerConfig: {
Expand All @@ -20,7 +32,7 @@ const config: ForgeConfig = {
'./resources/splashscreen.html',
'./resources/logo-splashscreen-dark.svg',
'./resources/logo-splashscreen.svg',
'./resources/' + getPlatform() + '/' + getArch(),
...getPlatformSpecificResources(),
],
osxSign: {
optionsForFile: () => {
Expand Down
Binary file modified resources/mac/x86_64/k6-studio-proxy
Binary file not shown.