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

Eslint fixes #10771

Closed
wants to merge 2 commits into from
Closed

Eslint fixes #10771

wants to merge 2 commits into from

Conversation

sam-github
Copy link
Contributor

@sam-github sam-github commented Jan 12, 2017

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • commit message follows commit guidelines
Affected core subsystem(s)

test, eslint

@sam-github sam-github requested a review from Trott January 12, 2017 19:38
@nodejs-github-bot nodejs-github-bot added tools Issues and PRs related to the tools directory. dont-land-on-v7.x labels Jan 12, 2017
Symlink added in f44969a, but it doesn't point to a file, causing
problems for tooling.
@sam-github
Copy link
Contributor Author

@Trott Sorry, I was careless and I broke the jslint target by not reconfirming CI was green after my final rebase before merge.

test: fix linting for test-tls-add-ca-cert.js should merge as soon as CI says its good, PTAL.

@sam-github
Copy link
Contributor Author

@nodejs/ctc

@cjihrig
Copy link
Contributor

cjihrig commented Jan 12, 2017

The test change LGTM. What's up with the eslint change? Also, can you link to the PR that broke the CI.

@sam-github
Copy link
Contributor Author

#10389 <--- I linked to the commit in test: fix linting for test-tls-add-ca-cert.js, and the commit links to the PR, is that enough? The PR has a chain of commits.

What's up with the eslint change?

Its a reapplication of #9299, which you LGTMed. However the eslint tools is getting vendored into node isn't working well.

@sam-github
Copy link
Contributor Author

The two commits are related, because git-watch make jslint fails on node master because there are invalid links comitted, then when that is fixed, fails when linting the test I added.

@sam-github
Copy link
Contributor Author

@cjihrig

@sam-github
Copy link
Contributor Author

Is it OK if I land them immediately, without waiting 48 hours?

Copy link
Member

@addaleax addaleax left a comment

Choose a reason for hiding this comment

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

LGTM and go for it

@sam-github
Copy link
Contributor Author

Landed in 0c8cfd4 and 822bbe0

Thanks for the reviews.

sam-github added a commit that referenced this pull request Jan 12, 2017
Reapplication of #9299 since the
symlink was re-added in f44969a.

PR-URL: #10771
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Anna Henningsen <[email protected]>
sam-github added a commit that referenced this pull request Jan 12, 2017
Fix lint error introduced in ea72331

PR-URL: #10771
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Anna Henningsen <[email protected]>
@sam-github sam-github closed this Jan 12, 2017
@sam-github sam-github deleted the eslint-fixes branch January 12, 2017 21:31
italoacasas pushed a commit to italoacasas/node that referenced this pull request Jan 18, 2017
Reapplication of nodejs#9299 since the
symlink was re-added in f44969a.

PR-URL: nodejs#10771
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Anna Henningsen <[email protected]>
italoacasas pushed a commit to italoacasas/node that referenced this pull request Jan 18, 2017
Fix lint error introduced in ea72331

PR-URL: nodejs#10771
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Anna Henningsen <[email protected]>
@gibfahn
Copy link
Member

gibfahn commented May 16, 2017

@sam-github this hasn't been backported yet right? LMK if you want it to land on v6.x.

@sam-github
Copy link
Contributor Author

eslint: remove dead and unused symlink already landed on #13059

test: fix linting for test-tls-add-ca-cert.js ends up being empty when rebased on 6.x, whatever lint problem it fixed must have gotten fixed somehow in some other commit or refactor of the test.

So, nothing to do here.

@sam-github
Copy link
Contributor Author

marked as landed on 6.x because it has

@gibfahn gibfahn mentioned this pull request Jun 15, 2017
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
tools Issues and PRs related to the tools directory.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants