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

*: fix broken depends and update #1362

Merged
merged 5 commits into from
May 17, 2021
Merged

Conversation

AstroProfundis
Copy link
Contributor

@AstroProfundis AstroProfundis commented May 13, 2021

What problem does this PR solve?

Fix #1360 and update some depends

What is changed and how it works?

  • Split client and bench to dedicated Go packages to avoid dependency conflicts
  • Upgrade usql to remove dependency of xoutil
  • Upgrade etcd to latest to avoid conflict of usql
  • Upgrade other depends with go mod tidy

Check List

Tests

  • Unit test

Release notes:

*: fix broken depends and update

@AstroProfundis AstroProfundis added this to the v1.5.0 milestone May 13, 2021
@AstroProfundis AstroProfundis requested a review from lucklove May 13, 2021 05:41
@AstroProfundis AstroProfundis self-assigned this May 13, 2021
@ti-chi-bot ti-chi-bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label May 13, 2021
@codecov-commenter
Copy link

codecov-commenter commented May 13, 2021

Codecov Report

Merging #1362 (4b07581) into master (dd6b818) will increase coverage by 29.04%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           master    #1362       +/-   ##
===========================================
+ Coverage   25.38%   54.43%   +29.04%     
===========================================
  Files         265      290       +25     
  Lines       20464    22346     +1882     
===========================================
+ Hits         5194    12163     +6969     
+ Misses      14473     8276     -6197     
- Partials      797     1907     +1110     
Flag Coverage Δ
cluster 41.81% <ø> (?)
dm 24.70% <ø> (?)
integrate 48.97% <ø> (+33.45%) ⬆️
playground 13.78% <ø> (?)
tiup 15.52% <ø> (ø)
unittest 21.68% <ø> (ø)

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

Impacted Files Coverage Δ
components/playground/main.go 60.52% <ø> (+57.01%) ⬆️
pkg/cluster/api/binlog.go 39.47% <ø> (+39.47%) ⬆️
pkg/cluster/spec/spec.go 89.00% <ø> (+30.49%) ⬆️
pkg/cluster/spec/util.go 77.77% <ø> (+61.11%) ⬆️
pkg/cluster/task/update_topology.go 72.22% <ø> (+72.22%) ⬆️
components/playground/instance/tidb.go 81.25% <0.00%> (ø)
components/playground/instance/drainer.go 0.00% <0.00%> (ø)
components/playground/instance/tikv_config.go 100.00% <0.00%> (ø)
components/dm/task/update_dm_meta.go 85.29% <0.00%> (ø)
components/playground/instance/process.go 81.39% <0.00%> (ø)
... and 214 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update dd6b818...4b07581. Read the comment docs.

Copy link
Member

@YangKeao YangKeao left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-chi-bot
Copy link
Member

@YangKeao: /lgtm is only allowed for the reviewers in list.

In response to this:

LGTM

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

components/client/main.go Outdated Show resolved Hide resolved
@lucklove
Copy link
Member

/lgtm

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • lucklove

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 writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label May 13, 2021
@AstroProfundis AstroProfundis deleted the fix-depends branch May 13, 2021 10:57
@AstroProfundis AstroProfundis restored the fix-depends branch May 13, 2021 10:58
@lucklove
Copy link
Member

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 4b07581

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 17, 2021
@ti-chi-bot ti-chi-bot merged commit 5059068 into pingcap:master May 17, 2021
@AstroProfundis AstroProfundis deleted the fix-depends branch May 17, 2021 06:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/XXL Denotes a PR that changes 1000+ 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

compile error repository 'https://github.com/xo/xoutil/' not found
5 participants