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

bin: inline tikv::binutil::* so that CARGO_PKG_VERSION is the correct version #14

Merged
merged 1 commit into from
Aug 6, 2019

Conversation

kennytm
Copy link
Collaborator

@kennytm kennytm commented Aug 6, 2019

What have you changed? (mandatory)

Inline the content of this file: https://github.com/tikv/tikv/blob/v3.0.2/src/binutil/mod.rs - into src/bin/tikv-importer.rs so that env!("CARGO_PKG_VERSION") returns the version of TiKV Importer instead of the TiKV dependency.

What are the type of the changes? (mandatory)

  • Bug fix (change which fixes an issue)

How has this PR been tested? (mandatory)

cargo check

Does this PR affect TiDB Lightning? (mandatory)

No

Refer to a related PR or issue link (optional)

Benchmark result if necessary (optional)

Add a few positive/negative examples (optional)

@kennytm kennytm added status/PTAL This PR is ready for review. Add this label back after committing new changes release-blocker Must be merged before the next release labels Aug 6, 2019
@kennytm kennytm force-pushed the kennytm/extract-version-print branch from ba91f85 to d614319 Compare August 6, 2019 13:29
@kennytm kennytm changed the title bin: inlines binutil::* so that CARGO_PKG_VERSION is the correct version bin: inline tikv::binutil::* so that CARGO_PKG_VERSION is the correct version Aug 6, 2019
@kennytm kennytm force-pushed the kennytm/extract-version-print branch from d614319 to 9b554dd Compare August 6, 2019 13:35
@kennytm kennytm marked this pull request as ready for review August 6, 2019 13:39
@kennytm
Copy link
Collaborator Author

kennytm commented Aug 6, 2019

/release

Copy link
Member

@lonng lonng left a comment

Choose a reason for hiding this comment

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

LGTM

@kennytm kennytm added status/LGT1 One reviewer already commented LGTM (LGTM1) and removed status/PTAL This PR is ready for review. Add this label back after committing new changes labels Aug 6, 2019
@kennytm kennytm merged commit 5f555bf into master Aug 6, 2019
@kennytm kennytm deleted the kennytm/extract-version-print branch August 6, 2019 14:08
@kennytm kennytm added status/LGT2 Two reviewers already commented LGTM, ready for merge (LGTM2) and removed status/LGT1 One reviewer already commented LGTM (LGTM1) labels Aug 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-blocker Must be merged before the next release status/LGT2 Two reviewers already commented LGTM, ready for merge (LGTM2)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants