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

tools: only diff the go.mod and go.sum (#2163) #2174

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #2163

What problem does this PR solve?

None

What is changed and how it works?

Only diff go.sum, otherwise there will be a lot of diff information after modifying the other codes.

Check List

Tests

  • No code

Code changes

None

Side effects

None

Related changes

  • Need to cherry-pick to the release branch

Release note

  • No release note

@ti-chi-bot ti-chi-bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-4.0 This PR is cherry-picked to release-4.0 from a source PR. labels Jun 28, 2021
@ti-chi-bot ti-chi-bot requested review from liuzix and lonng June 28, 2021 12:42
@amyangfei amyangfei added this to the v4.0.14 milestone Jun 29, 2021
@ti-chi-bot
Copy link
Member Author

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • amyangfei

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

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

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 29, 2021
@lonng lonng added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Jul 6, 2021
@amyangfei amyangfei added the require-LGT1 Indicates that the PR requires an LGTM. label Jul 7, 2021
@amyangfei
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

This pull request has been accepted and is ready to merge.

Commit hash: aac0fd1

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 7, 2021
@ti-chi-bot ti-chi-bot merged commit 4bd16ab into pingcap:release-4.0 Jul 7, 2021
@codecov-commenter
Copy link

Codecov Report

Merging #2174 (5fa65ca) into release-4.0 (753073a) will decrease coverage by 0.0535%.
The diff coverage is 62.2366%.

@@                 Coverage Diff                 @@
##           release-4.0      #2174        +/-   ##
===================================================
- Coverage      53.7661%   53.7125%   -0.0536%     
===================================================
  Files              153        163        +10     
  Lines            15958      17333      +1375     
===================================================
+ Hits              8580       9310       +730     
- Misses            6475       7041       +566     
- Partials           903        982        +79     

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. require-LGT1 Indicates that the PR requires an LGTM. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. type/cherry-pick-for-release-4.0 This PR is cherry-picked to release-4.0 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants