Skip to content
This repository was archived by the owner on Jul 24, 2024. It is now read-only.

Update the errors/parser dependence to the latest version#593

Merged
lonng merged 2 commits into
masterfrom
update-errors
Nov 10, 2020
Merged

Update the errors/parser dependence to the latest version#593
lonng merged 2 commits into
masterfrom
update-errors

Conversation

@lonng
Copy link
Copy Markdown
Contributor

@lonng lonng commented Nov 10, 2020

Signed-off-by: Lonng heng@lonng.org

What problem does this PR solve?

The PR pingcap/tiup#867 introduces functions that will merge the workaround/description from errors.toml with the error message from the repository. Make sure there are no conflicts between code and error metafile, the PR pingcap/errors#31 remove workaround/description options.

What is changed and how it works?

Check List

Tests

  • Unit test
  • Integration test

Release Note

  • No release note

Signed-off-by: Lonng <heng@lonng.org>
@CLAassistant
Copy link
Copy Markdown

CLAassistant commented Nov 10, 2020

CLA assistant check
All committers have signed the CLA.

@lonng lonng requested review from kennytm and overvenus and removed request for kennytm November 10, 2020 06:10
Copy link
Copy Markdown
Collaborator

@kennytm kennytm left a comment

Choose a reason for hiding this comment

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

LGTM.

Please sign the CLA.

@kennytm kennytm added the status/LGT1 LGTM1 label Nov 10, 2020
@lonng
Copy link
Copy Markdown
Contributor Author

lonng commented Nov 10, 2020

oops, seems to compile failure after merging master.

@kennytm
Copy link
Copy Markdown
Collaborator

kennytm commented Nov 10, 2020

/rebuild

Copy link
Copy Markdown
Member

@overvenus overvenus left a comment

Choose a reason for hiding this comment

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

LGTM

@lonng lonng merged commit a3517d6 into master Nov 10, 2020
@lonng lonng deleted the update-errors branch November 10, 2020 06:50
@lonng
Copy link
Copy Markdown
Contributor Author

lonng commented Nov 10, 2020

@overvenus Can the release-4.0 branch use the master branch of the parser?

@overvenus
Copy link
Copy Markdown
Member

@overvenus Can the release-4.0 branch use the master branch of the parser?

Not sure, we need to test. For now, BR keeps parser/kvproto the same as TiDB release-4.0

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants