Skip to content

go.mod: update BR dependency to the latest (#23429)#23431

Merged
ti-chi-bot merged 2 commits into
pingcap:release-5.0from
ti-srebot:release-5.0-96a0cda96ea0
Mar 19, 2021
Merged

go.mod: update BR dependency to the latest (#23429)#23431
ti-chi-bot merged 2 commits into
pingcap:release-5.0from
ti-srebot:release-5.0-96a0cda96ea0

Conversation

@ti-srebot
Copy link
Copy Markdown
Contributor

@ti-srebot ti-srebot commented Mar 19, 2021 •
edited
Loading

cherry-pick #23429 to release-5.0
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/23431

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/tidb.git pr/23431:release-5.0-96a0cda96ea0

What problem does this PR solve?

Problem Summary: This is a follow-up patch for #23270.

What is changed and how it works?

What's Changed: update BR dependency and remove alter-primary-key completely.

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test
  • Integration test

Side effects

NA

Release note

  • The configuration alter-primary-key is deprecated. Use NONCLUSTERED instead.

@ti-srebot
Copy link
Copy Markdown
Contributor Author

ti-srebot commented Mar 19, 2021

/run-all-tests

@ti-srebot ti-srebot mentioned this pull request Mar 19, 2021
Merged
@ti-srebot ti-srebot added component/config sig/sql-infra SIG: SQL Infra size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/5.0-cherry-pick labels Mar 19, 2021
@ti-chi-bot ti-chi-bot removed the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 19, 2021
@ti-srebot ti-srebot added this to the v5.0.0 ga milestone Mar 19, 2021
@ti-chi-bot ti-chi-bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Mar 19, 2021
@ti-srebot
Copy link
Copy Markdown
Contributor Author

ti-srebot commented Mar 19, 2021

@tangenta you're already a collaborator in bot's repo.

@lysu
Copy link
Copy Markdown
Contributor

lysu commented Mar 19, 2021

@tangenta need update version point to pingcap/br#897

@lysu lysu added the priority/release-blocker This issue blocks a release. Please solve it ASAP. label Mar 19, 2021
@ti-chi-bot ti-chi-bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 19, 2021
@lysu lysu requested review from coocood and wjhuang2016 March 19, 2021 09:38
@lysu
Copy link
Copy Markdown
Contributor

lysu commented Mar 19, 2021

need cherry-pick pingcap/br#902 first to avoid introduce dirty dependency

@lysu lysu force-pushed the release-5.0-96a0cda96ea0 branch from f10aa7c to ed7bc45 Compare March 19, 2021 14:01
@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Mar 19, 2021
tangenta and others added 2 commits March 19, 2021 22:01
@lysu
cherry pick pingcap#23429 to release-5.0
3e98359 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@lysu
use release-5.0 br
65d98c4
@lysu lysu force-pushed the release-5.0-96a0cda96ea0 branch from ed7bc45 to 65d98c4 Compare March 19, 2021 14:01
@lysu
Copy link
Copy Markdown
Contributor

lysu commented Mar 19, 2021

/run-all-tests

jackysp
jackysp approved these changes Mar 19, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@jackysp jackysp 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
Copy Markdown
Member

ti-chi-bot commented Mar 19, 2021

@jackysp: Please use /LGTM instead of LGTM when you want to approve the pull request by comment.
If you use the GitHub review feature, please approve the PR directly, the comment will not take effect in the GitHub review feature.
If you have any qustions please refer to lgtm command help or lgtm plugin design.

If you have approved this PR, please ignore this reply. This reply is being used as a temporary reply during the migration of the new bot and will be removed on April 1.

Details

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.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 19, 2021
@coocood
Copy link
Copy Markdown
Member

coocood commented Mar 19, 2021

/lgtm

@ti-chi-bot
Copy link
Copy Markdown
Member

ti-chi-bot commented Mar 19, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • coocood
  • jackysp

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.

Details

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 status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Mar 19, 2021
@lysu
Copy link
Copy Markdown
Contributor

lysu commented Mar 19, 2021

/merge

@ti-chi-bot
Copy link
Copy Markdown
Member

ti-chi-bot commented Mar 19, 2021

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

DetailsCommit hash: 65d98c4

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 19, 2021
@lysu
Copy link
Copy Markdown
Contributor

lysu commented Mar 19, 2021

/run-unit-test

@ti-chi-bot ti-chi-bot merged commit 03f11d2 into pingcap:release-5.0 Mar 19, 2021
@lysu lysu deleted the release-5.0-96a0cda96ea0 branch March 19, 2021 14:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jackysp jackysp jackysp approved these changes

@coocood coocood Awaiting requested review from coocood

@wjhuang2016 wjhuang2016 Awaiting requested review from wjhuang2016

Assignees

@tangenta tangenta

Labels

component/config priority/release-blocker This issue blocks a release. Please solve it ASAP. sig/sql-infra SIG: SQL Infra size/L Denotes a PR that changes 100-499 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/5.0-cherry-pick

Projects

None yet

Milestone

v5.0.0 ga

Development

Successfully merging this pull request may close these issues.

6 participants

@ti-srebot @lysu @ti-chi-bot @coocood @jackysp @tangenta