Skip to content

fix: Prevent conflict between parallel makers #3519

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

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
+7 −38
Open

fix: Prevent conflict between parallel makers #3519

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0200770
Prevent conflict between parallel makers
macdja38 Feb 29, 2024
e8e2075
Switch from solving the simultaneous make conflict with separate outp…
macdja38 Mar 7, 2024
1826a8f
Remove fs-extra which is no longer needed
macdja38 Mar 7, 2024
14b5720
Update maker tests to account for renaming being removed
macdja38 Mar 7, 2024
a26ffb2
Merge branch 'main' into main
macdja38 Mar 7, 2024
bb71fc3
Use title property to prevent output volume having arch + platform in…
macdja38 Mar 7, 2024
e2d7e9f
Add title to MakerDMG test
macdja38 Mar 7, 2024
b0f2ad9
Merge branch 'main' into main
macdja38 Mar 21, 2024
9e5bef2
Merge branch 'main' into main
macdja38 May 7, 2024
852d520
Remove extra .dmg
macdja38 May 16, 2024
327035f
Fix test
macdja38 May 16, 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
2 changes: 1 addition & 1 deletion packages/api/core/src/api/make.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ export const listrMake = (
packageJSON,
targetArch,
dir: packageDir,
makeDir: path.resolve(actualOutDir, 'make'),
makeDir: path.resolve(actualOutDir, `make-${platform}-${targetArch}`),
targetPlatform: platform,
});

Expand Down