mullvad / mullvadvpn-app

The Mullvad VPN client app for desktop and mobile
https://mullvad.net/
GNU General Public License v3.0
5.13k stars 342 forks source link

Fix `npm run build-x86` command in `nsventforwarder` #7220

Closed MarkusPettersson98 closed 4 days ago

MarkusPettersson98 commented 4 days ago

This PR fixes an issue introduced in https://github.com/mullvad/mullvadvpn-app/pull/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.

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