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: order of platform and arch npm env vars #1029

Merged
merged 1 commit into from
Dec 20, 2016

Conversation

lgeiger
Copy link
Contributor

@lgeiger lgeiger commented Dec 20, 2016

@develar develar merged commit f01a9f7 into electron-userland:master Dec 20, 2016
@lgeiger lgeiger deleted the fix-rebuild branch December 20, 2016 07:55
gregnolle added a commit to voidbridge/electron-builder that referenced this pull request Dec 24, 2016
* commit 'dcf3dbb48979291fb91301610de9e417e0ab7b79': (43 commits)
  feat: LSTypeIsPackage for file associations
  fix: Trim suffix from wine version (electron-userland#1033)
  fix: Stub Executables missing in Squirrel.Windows 1.5.1
  fix: order of platform and arch npm env vars (electron-userland#1029)
  feat: Set platform npm environment variable
  feat: Use Electron.Net to send http requests for auto updater
  docs: typo (electron-userland#1026)
  refactor: reexport HttpError
  feat(appx): more customizable manifest fields
  chore: prefer const
  feat: 32 bit appx
  fix: yarn detection
  feat: update Squirrel.Windows to 1.5.1
  fix: update nsis to 3.0.1
  docs: Added details about setting AUMID for Windows 8/8.1 notifications.
  fix: update nsis to 3.0.1
  test: attempt to make Win CI green
  test: use yarn on Appveyor
  fix: ENOENT for symlinks because directory was not created
  fix(electron-auto-updater): load default provider only if custom was not set
  ...

# Conflicts:
#	src/cli/install-app-deps.ts
#	src/cli/node-gyp-rebuild.ts
#	src/packager.ts
#	src/publish/restApiRequest.ts
#	src/targets/nsis.ts
#	src/util/httpRequest.ts
#	src/yarn.ts
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.

Set platform npm environment variable
2 participants