Skip to content

build: use nyc's merge command - #20760

Closed
bcoe wants to merge 1 commit into
nodejs:masterfrom
bcoe:coverage-improvements
Closed

build: use nyc's merge command#20760
bcoe wants to merge 1 commit into
nodejs:masterfrom
bcoe:coverage-improvements

Conversation

@bcoe

@bcoebcoe commented May 16, 2018

Copy link
Copy Markdown
Contributor

a 'merge' command has recently been added to nyc, eliminating the need
for the istanbul-merge library.

both nyc and istanbul-merge rely on istanbul-lib-coverage, using nyc to perform the merge will ensure the same library version is used for instrumenting coverage and merging reports.

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • commit message follows commit guidelines

@nodejs-github-botnodejs-github-bot added the build Issues and PRs related to build files or the CI. label May 16, 2018
@bcoe

bcoe commented May 16, 2018

Copy link
Copy Markdown
ContributorAuthor

CC: @addaleax

@mscdex

Copy link
Copy Markdown
Contributor

s/user/use/ in commit message?

@apapirovski

Copy link
Copy Markdown
Contributor

Subsystem is probably build unless I'm mistaken?

a 'merge' command has recently been added to nyc, eliminating the need
for the istanbul-merge library.
@bcoe
bcoeforce-pushed the coverage-improvements branch from ae7e2a6 to 9d9c17aCompareMay 16, 2018 05:49
@bcoebcoe changed the title test: user nyc's merge commandbuild: use nyc's merge commandMay 16, 2018

@addaleaxaddaleax left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks!

@BridgeARBridgeAR added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label May 18, 2018
BridgeAR pushed a commit to BridgeAR/node that referenced this pull request May 18, 2018
a 'merge' command has recently been added to nyc, eliminating the need
for the istanbul-merge library.
PR-URL: nodejs#20760
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
@BridgeAR

Copy link
Copy Markdown
Member

Landed in d5a117c 🎉

MylesBorins pushed a commit that referenced this pull request May 22, 2018
a 'merge' command has recently been added to nyc, eliminating the need
for the istanbul-merge library.
PR-URL: #20760
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
@addaleaxaddaleax mentioned this pull request May 22, 2018
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

author readyPRs that have at least one approval, no pending requests for changes, and a CI started.buildIssues and PRs related to build files or the CI.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants

@bcoe@mscdex@apapirovski@BridgeAR@addaleax@cjihrig@nodejs-github-bot