Skip to content

(feat): support universal arch for Darwin #575

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.

Sign up for GitHub

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

Merged
goosewobbler merged 17 commits into from
May 17, 2024
Merged

(feat): support universal arch for Darwin #575

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
6410b1b
feat: generate binary paths for each arch and check them all for exec…
goosewobbler May 16, 2024
b199604
refactor: use `@electron/packager` func to determine Forge archs
goosewobbler May 16, 2024
c6bf002
feat: support custom forge output dirs
goosewobbler May 16, 2024
bc3291e
fix: debug log for build tool conf
goosewobbler May 16, 2024
7372082
refactor: standardise EB nomenclature
goosewobbler May 16, 2024
fb21c3e
fix: pass electronVersion through to `getBinaryPath`
goosewobbler May 16, 2024
f6c2ad7
fix: log all app binaries in multiple case
goosewobbler May 16, 2024
a09630d
fix: rework async filter
goosewobbler May 16, 2024
0ff2853
fix: error handling, remove extra fileExists check
goosewobbler May 16, 2024
b4e5218
test: update for new arch approach, add forge custom outdir test
goosewobbler May 16, 2024
467378c
fix: use builder arch instead of process
goosewobbler May 16, 2024
8db7fd1
test: update launcher tests
goosewobbler May 16, 2024
af616a7
fix: use a single outdir for EB non-darwin
goosewobbler May 16, 2024
3e17403
test: improve application coverage
goosewobbler May 16, 2024
5bf1cf9
test: fix error string matching
goosewobbler May 16, 2024
5aeafda
test: add `mac-universal` e2es
goosewobbler May 17, 2024
bde6d6b
chore: test EB mac-universal only
goosewobbler May 17, 2024
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
Prev Previous commit
Next Next commit
fix: use builder arch instead of process
  • Loading branch information
@goosewobbler
goosewobbler committed May 16, 2024
commit 467378cffbeb1278cdf376b3e0f229b8136965f0
2 changes: 1 addition & 1 deletion src/application.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export async function getBinaryPath(
const archs: BuilderArch[] = ['arm64', 'armv7l', 'ia32', 'universal', 'x64'];
const builderOutDirName = (appBuildInfo.config as BuilderConfig)?.directories?.output || 'dist';
const builderOutDirMap = (arch: BuilderArch) => ({
darwin: path.join(builderOutDirName, arch === 'x64' ? 'mac' : `mac-${p.arch}`),
darwin: path.join(builderOutDirName, arch === 'x64' ? 'mac' : `mac-${arch}`),
linux: path.join(builderOutDirName, 'linux-unpacked'),
win32: path.join(builderOutDirName, 'win-unpacked'),
});
Expand Down