deps: fix npm files from upgrade to 4.1.2#11085
Closed
joaocgreis wants to merge 1 commit intonodejs:masterfrom
Closed
deps: fix npm files from upgrade to 4.1.2#11085joaocgreis wants to merge 1 commit intonodejs:masterfrom
joaocgreis wants to merge 1 commit intonodejs:masterfrom
Conversation
joaocgreis
added
the
npm
nodejs-github-bot
added
the
npm
Contributor
|
Yeah I'm surprised there wasn't a CI run for that PR... |
jasnell
approved these changes
Jan 31, 2017
Member
jasnell
left a comment
jasnell
left a comment
There was a problem hiding this comment.
:-( .... +1 for fast track. The original PR should not have landed in that state
targos
approved these changes
Jan 31, 2017
Member
Author
Member
|
+1 for fast-track I think the reason CI wasn't run is that there isn't much that tests If I can get #7867 in then we would be able to run the npm tests separately. |
2 tasks
Trott
approved these changes
Jan 31, 2017
Member
Trott
left a comment
Trott
left a comment
There was a problem hiding this comment.
LGTM. +1 to landing now. (All but 3 CI hosts have finished. Most importantly, Windows is passing.)
joaocgreis
added a commit
that referenced
this pull request
Jan 31, 2017
PR-URL: #11085 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
Member
Author
|
Landed in 35e749b |
3 tasks
Contributor
|
Gonna toss my belated LGTM in there and thanks for fixing these :) |
Contributor
|
😬 Thanks for merging! |
evanlucas
pushed a commit
that referenced
this pull request
Jan 31, 2017
PR-URL: #11085 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
Fishrock123
added a commit
that referenced
this pull request
Apr 26, 2017
Having multiple files with the same name but different casings causes problems on lots of OS-s. Refs: #12624 Refs: #11085 Refs: #11020 PR-URL: #12643 Reviewed-By: Vse Mozhet Byt <vsemozhetbyt@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Timothy Gu <timothygu99@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Alexey Orlenko <eaglexrlnk@gmail.com> Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
evanlucas
pushed a commit
that referenced
this pull request
May 1, 2017
Having multiple files with the same name but different casings causes problems on lots of OS-s. Refs: #12624 Refs: #11085 Refs: #11020 PR-URL: #12643 Reviewed-By: Vse Mozhet Byt <vsemozhetbyt@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Timothy Gu <timothygu99@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Alexey Orlenko <eaglexrlnk@gmail.com> Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
evanlucas
pushed a commit
that referenced
this pull request
May 2, 2017
Having multiple files with the same name but different casings causes problems on lots of OS-s. Refs: #12624 Refs: #11085 Refs: #11020 PR-URL: #12643 Reviewed-By: Vse Mozhet Byt <vsemozhetbyt@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Timothy Gu <timothygu99@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Alexey Orlenko <eaglexrlnk@gmail.com> Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
evanlucas
pushed a commit
that referenced
this pull request
May 2, 2017
Having multiple files with the same name but different casings causes problems on lots of OS-s. Refs: #12624 Refs: #11085 Refs: #11020 PR-URL: #12643 Reviewed-By: Vse Mozhet Byt <vsemozhetbyt@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Timothy Gu <timothygu99@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Alexey Orlenko <eaglexrlnk@gmail.com> Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
#11020 landed adding some files that look like merge temporary files, that are not handled well by Git on Windows. This PR just removes those files.
Is there any objection to fasttracking this? Windows CI is failing all runs for master: https://ci.nodejs.org/view/All/job/node-compile-windows/
cc @nodejs/npm @zkat @Fishrock123
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passesAffected core subsystem(s)
Deps