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

add edition field for the version information #7821

Merged
merged 10 commits into from May 13, 2020

Conversation

zhangjinpeng87
Copy link
Member

Signed-off-by: zhangjinpeng1987 zhangjinpeng@pingcap.com

What problem does this PR solve?

Add the edition field for the version information.

What is changed and how it works?

Add the edition field for the version information.

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • No code

Side effects

  • No

Release note

  • No release note

Signed-off-by: zhangjinpeng1987 <zhangjinpeng@pingcap.com>
@zhangjinpeng87 zhangjinpeng87 added the needs-cherry-pick-release-4.0 Type: Need cherry pick to release 4.0 label May 13, 2020
@zhangjinpeng87 zhangjinpeng87 added this to the v4.0.0-rc.2 milestone May 13, 2020
src/lib.rs Outdated
@@ -66,15 +66,18 @@ pub mod storage;
/// Returns the tikv version information.
pub fn tikv_version_info() -> String {
let fallback = "Unknown (env var does not exist when building)";
let edition = "Community";
Copy link
Member

Choose a reason for hiding this comment

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

How to define values other than community?

Signed-off-by: zhangjinpeng1987 <zhangjinpeng@pingcap.com>
Signed-off-by: zhangjinpeng1987 <zhangjinpeng@pingcap.com>
@lonng
Copy link
Member

lonng commented May 13, 2020

It's better to use the EDITION environment variable name. pingcap/tidb#17170

@zhangjinpeng87 zhangjinpeng87 modified the milestones: v4.0.0-rc.2, v4.0.0 May 13, 2020
@zhangjinpeng87
Copy link
Member Author

It's better to use the EDITION environment variable name. pingcap/tidb#17170

I think it's better to keep the existing style.

@zhangjinpeng87 zhangjinpeng87 added the status/can-merge Status: Can merge to base branch label May 13, 2020
@sre-bot
Copy link
Contributor

sre-bot commented May 13, 2020

Your auto merge job has been accepted, waiting for:

  • 7754
  • 7754
  • 7819
  • 7706

@sre-bot
Copy link
Contributor

sre-bot commented May 13, 2020

/run-all-tests

@sre-bot
Copy link
Contributor

sre-bot commented May 13, 2020

/run-all-tests

@sre-bot
Copy link
Contributor

sre-bot commented May 13, 2020

@zhangjinpeng1987 merge failed.

@zhangjinpeng87
Copy link
Member Author

/merge

@sre-bot
Copy link
Contributor

sre-bot commented May 13, 2020

/run-all-tests

@sre-bot sre-bot merged commit 007556d into tikv:master May 13, 2020
sre-bot pushed a commit to sre-bot/tikv that referenced this pull request May 13, 2020
Signed-off-by: zhangjinpeng1987 <zhangjinpeng@pingcap.com>
@sre-bot
Copy link
Contributor

sre-bot commented May 13, 2020

cherry pick to release-4.0 in PR #7831

zhangjinpeng87 pushed a commit that referenced this pull request May 14, 2020
Signed-off-by: zhangjinpeng1987 <zhangjinpeng@pingcap.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-cherry-pick-release-4.0 Type: Need cherry pick to release 4.0 status/can-merge Status: Can merge to base branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants