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 npm run build-x86 command in nsventforwarder #7220

Merged
merged 1 commit into from
Nov 21, 2024

Conversation

MarkusPettersson98
Copy link
Contributor

@MarkusPettersson98 MarkusPettersson98 commented Nov 21, 2024

This PR fixes an issue introduced in #7211 where a an extra dash (-) snuck into the build-x86 npm command in the nsventforwarder workspace. This messed up the variable substitution, which tripped up cp because we provided it with a nonsensical path.

  • Bad build-x86: cp ${CARGO_TARGET_DIR:--../../../target}
  • Good build-x86: cp ${CARGO_TARGET_DIR:-../../../target}

The consequence of this is that we can not package the x86-version of the macOS app, which subsequently disallows us from producing universal installers.

I've double-checked that this PR actually fixes the problem, and here is the proof:

$ ./build.sh --optimize --universal
..
  • building        target=pkg arch=universal file=/Users/markus/projects/mullvadvpn-app/dist/MullvadVPN-2024.7-dev-f01e57.pkg
[14:29:20] Finished 'builder-mac' after 33 s
[14:29:20] Finished 'pack-mac' after 41 s
~/projects/mullvadvpn-app
**********************************

 The build finished successfully!
 You have built:

 2024.7-dev-1f330c

**********************************

Sorry for the inconvenience 👉 👈 🥺


This change is Reviewable

Copy link
Member

@faern faern left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 1 of 1 files at r1, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@MarkusPettersson98 MarkusPettersson98 merged commit 1775c4a into main Nov 21, 2024
10 checks passed
@MarkusPettersson98 MarkusPettersson98 deleted the fix-nseventmonitor-build-command branch November 21, 2024 14:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants