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

build: use nyc's merge command #20760

Closed
wants to merge 1 commit into from
Closed

Conversation

bcoe
Copy link
Contributor

@bcoe bcoe commented May 16, 2018

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-bot nodejs-github-bot added the build Issues and PRs related to build files or the CI. label May 16, 2018
@bcoe
Copy link
Contributor Author

bcoe commented May 16, 2018

CC: @addaleax

@mscdex
Copy link
Contributor

mscdex commented May 16, 2018

s/user/use/ in commit message?

@apapirovski
Copy link
Member

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 bcoe changed the title test: user nyc's merge command build: use nyc's merge command May 16, 2018
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.

Thanks!

@BridgeAR BridgeAR 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
Member

Landed in d5a117c 🎉

@BridgeAR BridgeAR closed this May 18, 2018
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>
@addaleax addaleax mentioned this pull request May 22, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
author ready PRs that have at least one approval, no pending requests for changes, and a CI started. build Issues and PRs related to build files or the CI.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants