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

go mod: upgrade pingcap/tidb and pingcap/errors to latest release-4.0 #958

Merged
merged 4 commits into from
Sep 21, 2020

Conversation

amyangfei
Copy link
Contributor

@amyangfei amyangfei commented Sep 18, 2020

What problem does this PR solve?

pingcap/errors has a compatibility fix in pingcap/errors#26, CDC can upgrade to latest tidb release-4.0, in order to pass test with tidb master

Wait cherry-pick in tidb release-4.0 and parser release-4.0

What is changed and how it works?

upadte go mod

Check List

Tests

  • Unit test
  • Integration test

Release note

  • No release note

@amyangfei
Copy link
Contributor Author

/run-all-tests

@amyangfei amyangfei added the DNM label Sep 18, 2020
@amyangfei amyangfei added this to the v4.0.7 milestone Sep 21, 2020
@amyangfei amyangfei added the release-blocker This issue blocks a release. Please solve it ASAP. label Sep 21, 2020
@liuzix
Copy link
Contributor

liuzix commented Sep 21, 2020

/lgtm

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 21, 2020
@amyangfei
Copy link
Contributor Author

/run-all-tests

1 similar comment
@amyangfei
Copy link
Contributor Author

/run-all-tests

@amyangfei amyangfei added status/ptal Could you please take a look? and removed DNM labels Sep 21, 2020
@zier-one
Copy link
Contributor

lgtm

@ti-srebot ti-srebot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Sep 21, 2020
@codecov-commenter
Copy link

codecov-commenter commented Sep 21, 2020

Codecov Report

Merging #958 into master will not change coverage.
The diff coverage is n/a.

@@             Coverage Diff             @@
##             master       #958   +/-   ##
===========================================
  Coverage   32.1272%   32.1272%           
===========================================
  Files           100        100           
  Lines         11000      11000           
===========================================
  Hits           3534       3534           
  Misses         7064       7064           
  Partials        402        402           

@@ -50,3 +50,5 @@ require (
gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect
upper.io/db.v3 v3.7.1+incompatible
)

replace github.com/pingcap/tidb-tools => github.com/pingcap/tidb-tools v4.0.0-beta.0.20200921090810-52b9534ff3d5+incompatible
Copy link
Contributor Author

Choose a reason for hiding this comment

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

if we don't use go mod replace here, the tidb-tools always get the following hash
github.com/pingcap/tidb-tools v4.0.6-0.20200828085514-03575b185007+incompatible

@amyangfei
Copy link
Contributor Author

/run-all-tests

3 similar comments
@amyangfei
Copy link
Contributor Author

/run-all-tests

@amyangfei
Copy link
Contributor Author

/run-all-tests

@amyangfei
Copy link
Contributor Author

/run-all-tests

@amyangfei
Copy link
Contributor Author

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 21, 2020
@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot
Copy link
Contributor

@amyangfei merge failed.

@amyangfei
Copy link
Contributor Author

/merge

@ti-srebot
Copy link
Contributor

Your auto merge job has been accepted, waiting for:

  • 963

@amyangfei
Copy link
Contributor Author

/merge

@ti-srebot
Copy link
Contributor

Your auto merge job has been accepted, waiting for:

  • 963

@amyangfei
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot
Copy link
Contributor

@amyangfei merge failed.

@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot ti-srebot merged commit d5a0aeb into pingcap:master Sep 21, 2020
@amyangfei amyangfei deleted the update-go-mod branch September 21, 2020 14:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-blocker This issue blocks a release. Please solve it ASAP. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. status/ptal Could you please take a look?
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants