Skip to content

Conversation

@rvagg
Copy link
Member

@rvagg rvagg commented Oct 18, 2016

Make linting work again on v0.12! We've been missing this since we switched to lint-ci on Jenkins but nobody noticed (cause I'm pretty much the only one who runs it and I'd forgotten that it was only v0.10 that should fail linting).

/cc @nodejs/build

rvagg added 2 commits October 18, 2016 18:56
PR-URL: nodejs#9107
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
@nodejs-github-bot nodejs-github-bot added build Issues and PRs related to build files or the CI. v0.12 labels Oct 18, 2016
@rvagg
Copy link
Member Author

rvagg commented Oct 18, 2016

CI @ https://ci.nodejs.org/job/node-test-pull-request/4553/ with a happy linter!

fwiw I also cherry-picked over #9107 to v0.12-staging to fix a linting problem that's common with v0.10.

@jasnell
Copy link
Member

jasnell commented Oct 18, 2016

LGTM

Copy link
Member

@jbergstroem jbergstroem left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM


CONFLICT_RE=^>>>>>>> [0-9A-Fa-f]+|^<<<<<<< [A-Za-z]+
lint-ci: jslint cpplint
@if ! ( grep -IEqrs "$(CONFLICT_RE)" benchmark deps doc lib src test tools ) \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The SmartOS man-page didn't show all flags passed to grep being available, but it seems to work fine anyway.

jasnell pushed a commit that referenced this pull request Oct 28, 2016
PR-URL: #9151
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Minwoo Jung <[email protected]>
Reviewed-By: Johan Bergström <[email protected]>
Reviewed-By: James M Snell <[email protected]>
@jasnell
Copy link
Member

jasnell commented Oct 28, 2016

Landed in a47fd45

@jasnell jasnell closed this Oct 28, 2016
jBarz pushed a commit to ibmruntimes/node that referenced this pull request Dec 22, 2016
PR-URL: nodejs/node#9151
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Minwoo Jung <[email protected]>
Reviewed-By: Johan Bergström <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

build Issues and PRs related to build files or the CI.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants