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

*: merge BR into TiDB #26655

Merged
merged 22 commits into from
Aug 5, 2021
Merged

*: merge BR into TiDB #26655

merged 22 commits into from
Aug 5, 2021

Conversation

3pointer
Copy link
Contributor

@3pointer 3pointer commented Jul 27, 2021

What problem does this PR solve?

Issue Number: close #26880

Problem Summary: Merge BR repo into TiDB. and resolve the cycle dependence in BR and TiDB.

What is changed and how it works?

Don't review this PR. because it has the whole br repo files change.
Review 3pointer#2 instead.

This PR is used to trigger CI.

Check List

Tests

  • Unit test
  • Integration test

Release note

Merge BR repo into TiDB to resolve the cycle dependence between these two repos.

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jul 27, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • YuJuncen
  • bb7133
  • wjhuang2016

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 release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. and removed release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Jul 27, 2021
@3pointer
Copy link
Contributor Author

/run-all-tests

@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 29, 2021
@tisonkun
Copy link
Contributor

@3pointer may we create an issue to describe the step? I think it is nit to have a proposal but an issue it necessary.

@tisonkun
Copy link
Contributor

I'd regard forum post as a pre discussion to gather suggestion.

@3pointer
Copy link
Contributor Author

/run-unit-tests

@3pointer 3pointer force-pushed the merge_br_squash branch 2 times, most recently from 0eff247 to 667f6c1 Compare August 2, 2021 02:40
@ti-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 2, 2021
@3pointer 3pointer force-pushed the merge_br_squash branch 4 times, most recently from 8cc826c to c79c3f6 Compare August 2, 2021 04:33
@3pointer
Copy link
Contributor Author

3pointer commented Aug 2, 2021

/run-integration-tests

@zhouqiang-cl zhouqiang-cl removed the do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. label Aug 4, 2021
@3pointer 3pointer marked this pull request as ready for review August 4, 2021 03:39
@ti-chi-bot ti-chi-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 4, 2021
@3pointer 3pointer mentioned this pull request Aug 4, 2021
8 tasks
@ti-chi-bot ti-chi-bot added the release-note-none Denotes a PR that doesn't merit a release note. label Aug 4, 2021
@tisonkun
Copy link
Contributor

tisonkun commented Aug 4, 2021

@3pointer is it true that we don't need a release note for this change? I think it changes BR import path at least.

@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Aug 4, 2021
Copy link
Contributor

@YuJuncen YuJuncen left a comment

Choose a reason for hiding this comment

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

LGTM, and some hints for the following reviewers:

  1. Among the ~200 files, most of them are trivial import path fix, don't panic.
  2. The non-trivial changes are mainly clustered at project config files, say, Makefile, log.go, etc..

@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 Aug 5, 2021
@3pointer
Copy link
Contributor Author

3pointer commented Aug 5, 2021

/run-check_dev_2

@3pointer
Copy link
Contributor Author

3pointer commented Aug 5, 2021

/run-check_dev_2

@tisonkun
Copy link
Contributor

tisonkun commented Aug 5, 2021

@wjhuang2016 @YuJuncen if this PR is good to go, would you mind to help on merging?

@bb7133 bb7133 added the require-LGT3 Indicates that the PR requires three LGTM. label Aug 5, 2021
Makefile Outdated Show resolved Hide resolved
@bb7133
Copy link
Member

bb7133 commented Aug 5, 2021

IMHO there are several next step TODOs:

But they are not related to code engineering itself, we do not have to finish it in this PR.

@ti-chi-bot ti-chi-bot added status/LGT3 The PR has already had 3 LGTM. and removed status/LGT2 Indicates that a PR has LGTM 2. labels Aug 5, 2021
@bb7133
Copy link
Member

bb7133 commented Aug 5, 2021

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 049a8e1

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 5, 2021
@ti-chi-bot
Copy link
Member

@3pointer: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

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 merged commit 1a54708 into pingcap:master Aug 5, 2021
joccau pushed a commit to joccau/tidb that referenced this pull request Sep 7, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note Denotes a PR that will be considered when it comes time to generate release notes. require-LGT3 Indicates that the PR requires three LGTM. 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/LGT3 The PR has already had 3 LGTM.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Merge BR to TiDB
8 participants