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

deps: upgrade to npm 2.10.1 #1763

Closed
wants to merge 3 commits into from
Closed

deps: upgrade to npm 2.10.1 #1763

wants to merge 3 commits into from

Conversation

iarna
Copy link
Member

@iarna iarna commented May 22, 2015

The main thing 2.10.x brings is SPDX validation.

Plus what's in: #1658

Release notes are here:

r: @Fishrock123
r: @chrisdickinson

iarna and others added 2 commits May 22, 2015 03:15
Every npm version bump requires a few patches to be floated on
node-gyp for io.js compatibility. These patches are found in
03d1992,
5de334c, and
da730c7. This commit squashes
them into a single commit.

PR-URL: nodejs#990
Reviewed-By: Ben Noordhuis <[email protected]>
@iarna iarna changed the title Npm 2.10.1 deps: upgrade to npm 2.10.1 May 22, 2015
@silverwind silverwind added the npm Issues and PRs related to the npm client dependency or the npm registry. label May 22, 2015
@Fishrock123
Copy link
Contributor

Hmmm, the commits have the correct parents, I wonder why GitHub has them out-of order?

@iarna is it possible you could squash the win,node-gyp patches together with the commit message of:

win,node-gyp: enable delay-load hook by default

The delay-load hook allows node.exe/iojs.exe to be renamed. See efadffe
for more background.

(That would seem most reasonable to me, cc @piscisaureus)

Edit: hmmm, I might just edit it to include mine / bert's signoff and a link to this PR, that's how it was done for the first patch.

@Fishrock123
Copy link
Contributor

PR LGTM otherwise, tests seem fine, but:

  2275 passing (5m)
  1 pending

I'm not really sure why one is pending, this seems new. (I don't have couchdb installed, is that why?)

@iarna
Copy link
Member Author

iarna commented May 22, 2015

@Fishrock123: Yeah, the out of orderness was unexpected. Squashing those would be no trouble, do you still want me to do that or did you change your mind?

@Fishrock123
Copy link
Contributor

@iarna I'd still like them squashed, but I'd also prefer to have general sign-off from bert, although the latter isn't strictly necessary.

I can edit the commit message to add more details upon landing, the above message should do for the squashed commit.

@rvagg
Copy link
Member

rvagg commented May 23, 2015

Welcome @iarna! I'm so happy to see this move beyond just being a load on @othiym23.

The delay-load hook allows node.exe/iojs.exe to be renamed. See efadffe
for more background.
@iarna
Copy link
Member Author

iarna commented May 23, 2015

@Fishrock123 I just repushed with the commits squashed.

Fishrock123 pushed a commit that referenced this pull request May 24, 2015
PR-URL: #1763
Reviewed-By: Jeremiah Senkpiel <[email protected]>
piscisaureus added a commit that referenced this pull request May 24, 2015
The delay-load hook allows node.exe/iojs.exe to be renamed. See efadffe
for more background.

This commit is a combined squash of the following previous patches:
ba93c58,
3bda6cb,
0d6d3dd.

PR-URL: #1763
Reviewed-By: Jeremiah Senkpiel <[email protected]>
@Fishrock123
Copy link
Contributor

Thanks, landed in c54d057...d144e96 :)

@Fishrock123
Copy link
Contributor

@iarna you may want to update your release wiki doc to use d144e96 (new delay-load hook squash) for the future. :)

@iarna
Copy link
Member Author

iarna commented May 24, 2015

@Fishrock123 Will do!

@rvagg
Copy link
Member

rvagg commented May 24, 2015

FYI, 2.1.0 is going out with just a note about the upgrade and links to the release notes, if you want "notable items" in the changelog here then they'll need to come in on the PR as we can't include the full release notes.

othiym23 pushed a commit to npm/node that referenced this pull request May 29, 2015
The delay-load hook allows node.exe/iojs.exe to be renamed. See efadffe
for more background.

This commit is a combined squash of the following previous patches:
ba93c58,
3bda6cb,
0d6d3dd.

PR-URL: nodejs#1763
Reviewed-By: Jeremiah Senkpiel <[email protected]>
piscisaureus added a commit that referenced this pull request May 30, 2015
The delay-load hook allows node.exe/iojs.exe to be renamed. See efadffe
for more background.

This commit is a combined squash of the following previous patches:
ba93c58,
3bda6cb,
0d6d3dd.

PR-URL: #1763
Reviewed-By: Jeremiah Senkpiel <[email protected]>
@rvagg rvagg mentioned this pull request May 31, 2015
andrewdeandrade pushed a commit to andrewdeandrade/node that referenced this pull request Jun 3, 2015
PR-URL: nodejs/node#1763
Reviewed-By: Jeremiah Senkpiel <[email protected]>
andrewdeandrade pushed a commit to andrewdeandrade/node that referenced this pull request Jun 3, 2015
The delay-load hook allows node.exe/iojs.exe to be renamed. See efadffe
for more background.

This commit is a combined squash of the following previous patches:
ba93c58,
3bda6cb,
0d6d3dd.

PR-URL: nodejs/node#1763
Reviewed-By: Jeremiah Senkpiel <[email protected]>
andrewdeandrade pushed a commit to andrewdeandrade/node that referenced this pull request Jun 3, 2015
The delay-load hook allows node.exe/iojs.exe to be renamed. See efadffe
for more background.

This commit is a combined squash of the following previous patches:
ba93c58,
3bda6cb,
0d6d3dd.

PR-URL: nodejs/node#1763
Reviewed-By: Jeremiah Senkpiel <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
npm Issues and PRs related to the npm client dependency or the npm registry.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants