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 npm to 2.14.9 (for v0.12-staging) #3684

Closed
wants to merge 1 commit into from

Conversation

othiym23
Copy link
Contributor

@othiym23 othiym23 commented Nov 6, 2015

(I'll create a separate PR for v4.x-staging.)

This is a rollup release that includes everything since npm@2.13.4, so much has changed. See CHANGELOG.md for details. I ran make test-npm against this and everything passed, but it would be good to get confirmation from someone in the release WG.

r: @Fishrock123

@othiym23 othiym23 added npm Issues and PRs related to the npm client dependency or the npm registry. land-on-v0.12 labels Nov 6, 2015
This is a roll-up release that includes all changes to npm since 2.13.4.
@othiym23
Copy link
Contributor Author

othiym23 commented Nov 6, 2015

Whitespace fix applied, and force-pushed. Also, reminded myself to read the release process docs more carefully in the future. 🎉

@Fishrock123
Copy link
Contributor

Hmm, patch doesn't like applying for me, same base.

Jeremiahs-MacBook-Pro:node Jeremiah$ curl -L https://github.com/nodejs/node/pull/3684.patch | git am --whitespace=fix
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
100   138    0   138    0     0    380      0 --:--:-- --:--:-- --:--:--   380
100 3699k    0 3699k    0     0   973k      0 --:--:--  0:00:03 --:--:-- 1152k
Applying: deps: upgrade npm to 2.14.9
error: deps/npm/test/fixtures/config/userconfig-with-gc: does not match index
Patch failed at 0001 deps: upgrade npm to 2.14.9
The copy of the patch that failed is found in:
   /Users/Jeremiah/documents/node/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

@Fishrock123
Copy link
Contributor

Test pass fine. Looks like the diff is too big for me to go though, so rubber-stamp-ish LGTM.

@jasnell
Copy link
Member

jasnell commented Nov 15, 2015

LGTM

othiym23 added a commit that referenced this pull request Nov 15, 2015
This is a roll-up release that includes all changes to npm since 2.13.4.

PR-URL: #3684
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
@jasnell
Copy link
Member

jasnell commented Nov 15, 2015

Landed in v0.12-staging in ca97fb6

@jasnell jasnell closed this Nov 15, 2015
@rvagg rvagg mentioned this pull request Nov 19, 2015
jBarz pushed a commit to ibmruntimes/node that referenced this pull request Nov 4, 2016
This is a roll-up release that includes all changes to npm since 2.13.4.

PR-URL: nodejs/node#3684
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
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.

3 participants