[v6.x backport] build, doc, tools: use eslint-plugin-markdown#14067
[v6.x backport] build, doc, tools: use eslint-plugin-markdown#14067vsemozhetbyt wants to merge 4 commits intonodejs:v6.x-stagingfrom vsemozhetbyt:backport-eslint-md-to-v6.x
Conversation
|
This backport departs from canonical way due to a complicated situation with all 1.+2. First and second commits from #12563 were backported as is (with conflicts resolved), metadata is preserved. 3. Conform more docs to eslint-plugin-markdown. There was a pretty different situation with docs in the 4. As all the commits after the third commit in #12563 were various patches, all of them were combined in one commit (i.e: the third and the fourth commits from #12563 + all the appropriate commits from #12640 and #14047). This commit has these changes in one transaction (without old metadata):
As I used |
|
Failures look unrelated. It might be nice to have the changes to the doc files in their own commit prior to landing the linter. Thoguhts? |
|
@MylesBorins I've split the last commit in doc commit + other changes commit. |
8850007 to
8860117
Compare
|
Something wrong has happened with the PR since my last push. |
|
You are going to have to rebase against staging.
…On Jul 11, 2017 6:34 PM, "Vse Mozhet Byt" ***@***.***> wrote:
Something wrong happens with the PR since my last push.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#14067 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/AAecVzkXaRivBTTl_lCs2UttHnTFi0UJks5sM7I8gaJpZM4OMxf9>
.
|
|
It is strange. After rebasing I have this commit order: $ git log --oneline
49b9634453 (HEAD -> backport-eslint-md-to-v6.x, origin/backport-eslint-md-to-v6.x) build, doc, tools: add eslint-plugin-markdown
dce79a4b49 doc: conform more docs to eslint-plugin-markdown
74d2932751 doc: conform to rules for eslint-plugin-markdown
59b93bccb0 doc: prepare js code for eslint-plugin-markdown
8860117600 (upstream/v6.x-staging) addons: remove semicolons from after module definition
...But after pushing, in the PR the last two commit are swapped. How can I fix this? |
|
Fixed by re-push after interactive quasi-rebase. |
|
this will have to be rebased again. Thanks for patience. Some of the commits are missing meta data... are some of them new to this backport? |
This is an initial step to eliminate most of parsing errors. PR-URL: #12563 Refs: #12557 (comment) Reviewed-By: Teddy Katz <teddy.katz@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Timothy Gu <timothygu99@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
PR-URL: #12563 Refs: #12557 (comment) Reviewed-By: Teddy Katz <teddy.katz@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Timothy Gu <timothygu99@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
|
@MylesBorins Rebased. PR has a complicated story (see the second comment), so the metadata from the original commits would not be completely proper here. |
This is an initial step to eliminate most of parsing errors. Backport-PR-URL: #14067 PR-URL: #12563 Refs: #12557 (comment) Reviewed-By: Teddy Katz <teddy.katz@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Timothy Gu <timothygu99@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
Backport-PR-URL: #14067 PR-URL: #12563 Refs: #12557 (comment) Reviewed-By: Teddy Katz <teddy.katz@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Timothy Gu <timothygu99@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
* Install eslint-plugin-markdown@1.0.0-beta.7 * Add doc/.eslintrc.yaml * Add `plugins: [markdown]` to the main .eslintrc.yaml * .js files in doc folder added to .eslintignore * Update Makefile, vcbuild.bat, and tools/jslint.js Refs: #12563 Refs: #12640 Refs: #14047 PR-URL: #14067 Reviewed-By: James Snell <jasnell@gmail.com> Reviewed-By: Myles Borins <myles.borins@gmail.com>
|
landed in 0b17a45...ce4718f |
|
@nodejs/collaborators, if you have any x6 backports with new/edited code fragments in docs, you may need re-run linter CI after this landing. |
|
@vsemozhetbyt I assume |
This is an initial step to eliminate most of parsing errors. Backport-PR-URL: #14067 PR-URL: #12563 Refs: #12557 (comment) Reviewed-By: Teddy Katz <teddy.katz@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Timothy Gu <timothygu99@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
Backport-PR-URL: #14067 PR-URL: #12563 Refs: #12557 (comment) Reviewed-By: Teddy Katz <teddy.katz@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Timothy Gu <timothygu99@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
* Install eslint-plugin-markdown@1.0.0-beta.7 * Add doc/.eslintrc.yaml * Add `plugins: [markdown]` to the main .eslintrc.yaml * .js files in doc folder added to .eslintignore * Update Makefile, vcbuild.bat, and tools/jslint.js Refs: #12563 Refs: #12640 Refs: #14047 PR-URL: #14067 Reviewed-By: James Snell <jasnell@gmail.com> Reviewed-By: Myles Borins <myles.borins@gmail.com>
|
@sam-github Maybe, I am not sure. I usually do |
|
That's what |
This is an initial step to eliminate most of parsing errors. Backport-PR-URL: #14067 PR-URL: #12563 Refs: #12557 (comment) Reviewed-By: Teddy Katz <teddy.katz@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Timothy Gu <timothygu99@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
Backport-PR-URL: #14067 PR-URL: #12563 Refs: #12557 (comment) Reviewed-By: Teddy Katz <teddy.katz@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Timothy Gu <timothygu99@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
* Install eslint-plugin-markdown@1.0.0-beta.7 * Add doc/.eslintrc.yaml * Add `plugins: [markdown]` to the main .eslintrc.yaml * .js files in doc folder added to .eslintignore * Update Makefile, vcbuild.bat, and tools/jslint.js Refs: #12563 Refs: #12640 Refs: #14047 PR-URL: #14067 Reviewed-By: James Snell <jasnell@gmail.com> Reviewed-By: Myles Borins <myles.borins@gmail.com>
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passesAffected core subsystem(s)
build, doc, tools
Backport of: #12563 + #12640 + #14047