Skip to content

Backport 12162 to 6.x #12504

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.

Sign up for GitHub

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

Jump to bottom
Closed
Trott wants to merge 2 commits into from
Closed

Backport 12162 to 6.x #12504

Trott wants to merge 2 commits into from

Conversation

@Trott
Copy link
Member

@Trott Trott commented Apr 19, 2017

backport of #12162 to 6.x

@MylesBorins

@nodejs-github-bot nodejs-github-bot added tools Issues and PRs related to the tools directory. v6.x labels Apr 19, 2017
@Trott Trott mentioned this pull request Apr 19, 2017
Closed
2 tasks
@thefourtheye
Copy link
Contributor

thefourtheye commented Apr 19, 2017

CI: https://ci.nodejs.org/job/node-test-pull-request/7506/

@Trott
Copy link
Member Author

Trott commented Apr 19, 2017

Well that's too bad. I thought I ran the linter to make sure it was working. Guess I did not.

@Trott Trott force-pushed the backport-12162-to-6.x branch from 35ccdd7 to fcc759f Compare April 19, 2017 22:36
@Trott
Copy link
Member Author

Trott commented Apr 19, 2017

OK, fixed. At least the lint rules are fixed anyway. Sorry about that.

@thefourtheye
Copy link
Contributor

thefourtheye commented Apr 20, 2017

Cool. Trying CI one more time.. https://ci.nodejs.org/job/node-test-pull-request/7541/

@Trott
Copy link
Member Author

Trott commented Apr 20, 2017

Is the FreeBSD test-net-write-after-close failure a known flaky on the v6.x branch? Seems unrelated to this...

@MylesBorins
Copy link
Contributor

MylesBorins commented Apr 24, 2017

@Trott it isn't flaky AFAIK... will run tests again on release branch to check

@Trott
Copy link
Member Author

Trott commented Apr 25, 2017

CI: https://ci.nodejs.org/job/node-test-pull-request/7676/

@Trott
Copy link
Member Author

Trott commented Apr 25, 2017

Only CI failure is build/infra related.

Trott added 2 commits April 25, 2017 15:09
@Trott
tools: update ESLint to 3.19.0
4bb18c5 
PR-URL: nodejs#12162
Reviewed-By: Teddy Katz <teddy.katz@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
@Trott
tools: replace custom ESLint timers rule
d533e92 
ESLint 3.19.0 allows the specification of selectors that represent
disallowed syntax. Replace our custom rule for timer arguments with a
pair of `no-restricted-syntax` option objects.
@Trott Trott force-pushed the backport-12162-to-6.x branch from fcc759f to d533e92 Compare April 25, 2017 22:09
@Trott
Copy link
Member Author

Trott commented Apr 25, 2017

CI again post-rebase: https://ci.nodejs.org/job/node-test-pull-request/7679/

@Trott
Copy link
Member Author

Trott commented Apr 26, 2017

CI looks good. Just the usual clang bot failure on v6.x. (At least, I think it's the usual. Regardless, it's build-related, not related to this change.)

MylesBorins
MylesBorins approved these changes Apr 26, 2017
View reviewed changes
Copy link
Contributor

@MylesBorins MylesBorins left a comment

Choose a reason for hiding this comment

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

LGTM

MylesBorins pushed a commit that referenced this pull request Apr 26, 2017
@Trott @MylesBorins
tools: update ESLint to 3.19.0
9bfbe11 
Backport-PR-URL: #12504
PR-URL: #12162
Reviewed-By: Teddy Katz <teddy.katz@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
MylesBorins pushed a commit that referenced this pull request Apr 26, 2017
@Trott @MylesBorins
tools: replace custom ESLint timers rule
cf26d15 
ESLint 3.19.0 allows the specification of selectors that represent
disallowed syntax. Replace our custom rule for timer arguments with a
pair of `no-restricted-syntax` option objects.

PR-URL: #12504
Reviewed-By: Myles Borins <myles.borins@gmail.com>
@MylesBorins
Copy link
Contributor

MylesBorins commented Apr 26, 2017

landed in 9218661...cf26d15

MylesBorins pushed a commit that referenced this pull request May 2, 2017
@Trott @MylesBorins
tools: update ESLint to 3.19.0
736a736 
Backport-PR-URL: #12504
PR-URL: #12162
Reviewed-By: Teddy Katz <teddy.katz@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
MylesBorins pushed a commit that referenced this pull request May 2, 2017
@Trott @MylesBorins
tools: replace custom ESLint timers rule
87534d6 
ESLint 3.19.0 allows the specification of selectors that represent
disallowed syntax. Replace our custom rule for timer arguments with a
pair of `no-restricted-syntax` option objects.

PR-URL: #12504
Reviewed-By: Myles Borins <myles.borins@gmail.com>
@MylesBorins MylesBorins mentioned this pull request May 23, 2017
Merged
andrew749 pushed a commit to michielbaird/node that referenced this pull request Jul 19, 2017
@Trott @andrew749
tools: update ESLint to 3.19.0
dabf807 
Backport-PR-URL: nodejs/node#12504
PR-URL: nodejs/node#12162
Reviewed-By: Teddy Katz <teddy.katz@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
andrew749 pushed a commit to michielbaird/node that referenced this pull request Jul 19, 2017
@Trott @andrew749
tools: replace custom ESLint timers rule
26f0bc1 
ESLint 3.19.0 allows the specification of selectors that represent
disallowed syntax. Replace our custom rule for timer arguments with a
pair of `no-restricted-syntax` option objects.

PR-URL: nodejs/node#12504
Reviewed-By: Myles Borins <myles.borins@gmail.com>
@Trott Trott deleted the backport-12162-to-6.x branch January 13, 2022 22:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@MylesBorins MylesBorins MylesBorins approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@MylesBorins MylesBorins

Labels

tools Issues and PRs related to the tools directory.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Trott @thefourtheye @MylesBorins @nodejs-github-bot