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

add merge command #91

Merged
merged 3 commits into from
Aug 6, 2020
Merged

add merge command #91

merged 3 commits into from
Aug 6, 2020

Conversation

lyyyuna
Copy link
Collaborator

@lyyyuna lyyyuna commented Aug 5, 2020

@codecov
Copy link

codecov bot commented Aug 5, 2020

Codecov Report

Merging #91 into master will increase coverage by 0.26%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master      #91      +/-   ##
==========================================
+ Coverage   81.05%   81.32%   +0.26%     
==========================================
  Files          33       34       +1     
  Lines        1742     1767      +25     
==========================================
+ Hits         1412     1437      +25     
  Misses        209      209              
  Partials      121      121              
Flag Coverage Δ
#e2e-1.11.x 46.29% <52.00%> (+0.08%) ⬆️
#e2e-1.12.x 46.17% <52.00%> (-0.15%) ⬇️
#e2e-1.13.x 46.40% <52.00%> (+0.08%) ⬆️
#e2e-1.14.x 46.29% <52.00%> (+0.08%) ⬆️
#unittest-1.13.x 71.44% <88.00%> (+0.23%) ⬆️
#unittest-1.14.x 71.44% <88.00%> (+0.35%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
pkg/cover/client.go 86.44% <ø> (ø)
cmd/merge.go 100.00% <100.00%> (ø)

@lyyyuna
Copy link
Collaborator Author

lyyyuna commented Aug 5, 2020

/assign @CarlJi

Short: "Merge multiple coherent Go coverage files into a single file.",
Long: `merge will merge multiple Go coverage files into a single coverage file.
merge requires that the files are 'coherent', meaning that if they both contain references to the
same paths, then the contents of those source files were identical for the binary that generated
Copy link
Collaborator

Choose a reason for hiding this comment

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

were => are

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

binary is generated some times ago, so it should be were.

actually i copy the 'long' content from https://github.com/kubernetes/test-infra/blob/master/gopherage/cmd/merge/merge.go. >_<

@CarlJi
Copy link
Collaborator

CarlJi commented Aug 6, 2020

/lgtm
/approve

@qiniu-bot qiniu-bot added the lgtm label Aug 6, 2020
@qiniu-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CarlJi, lyyyuna

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@qiniu-bot qiniu-bot merged commit 34f3cd4 into qiniu:master Aug 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

add support for merging multiple coverage profiles
3 participants