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.

Sign up for GitHub

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

Jump to bottom

update version and tiup playground supports M1 silicon #6791

Merged
merged 5 commits into from
Aug 25, 2021
Merged

update version and tiup playground supports M1 silicon #6791

merged 5 commits into from
Aug 25, 2021

Conversation

lilyjazz
Copy link
Member

@lilyjazz lilyjazz commented Aug 2, 2021

First-time contributors' checklist

What is changed, added or deleted? (Required)

Which TiDB version(s) do your changes apply to? (Required)

Tips for choosing the affected version(s):

By default, CHOOSE MASTER ONLY so your changes will be applied to the next TiDB major or minor releases. If your PR involves a product feature behavior change or a compatibility change, CHOOSE THE AFFECTED RELEASE BRANCH(ES) AND MASTER.

For details, see tips for choosing the affected versions (in Chinese).

  • master (the latest development version)
  • v5.1 (TiDB 5.1 versions)
  • v5.0 (TiDB 5.0 versions)
  • v4.0 (TiDB 4.0 versions)
  • v3.1 (TiDB 3.1 versions)
  • v3.0 (TiDB 3.0 versions)
  • v2.1 (TiDB 2.1 versions)

need to cherry-pick to v5.2

What is the related PR or file link(s)?

  • This PR is translated from:
  • Other reference link(s):

Do your changes match any of the following descriptions?

  • Delete files
  • Change aliases
  • Need modification after applied to another branch
  • Might cause conflicts after applied to another branch

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 2, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • TomShawn

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 missing-translation-status This PR does not have translation status info. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 2, 2021
@TomShawn TomShawn self-assigned this Aug 2, 2021
@TomShawn TomShawn added translation/doing This PR’s assignee is translating this PR. type/compatibility-or-feature-change This PR involves compatibility changes or feature behavior changes. labels Aug 2, 2021
@ti-chi-bot ti-chi-bot removed the missing-translation-status This PR does not have translation status info. label Aug 2, 2021
@TomShawn TomShawn added v5.2 This PR/issue applies to TiDB v5.2. and removed type/compatibility-or-feature-change This PR involves compatibility changes or feature behavior changes. labels Aug 2, 2021
TomShawn
TomShawn approved these changes Aug 6, 2021
View reviewed changes
Copy link
Contributor

@TomShawn TomShawn 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 ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 6, 2021
@TomShawn TomShawn added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 10, 2021
@lilyjazz
Copy link
Member Author

@TomShawn 我发现之前在 playground 启动之后的描述有一些错误，进行了修复。

TomShawn
TomShawn reviewed Aug 10, 2021
View reviewed changes
quick-start-with-tidb.md Outdated
@@ -76,6 +72,7 @@ TiDB 是一个分布式系统。最基础的 TiDB 测试集群通常由 2 个 Ti

> **注意：**
>
> + 只有 v5.1.1 及以上版本的 TiDB，才可以在 Apple M1 Silicon 的机器上运行 `tiup playground`。
Copy link
Contributor

@TomShawn TomShawn Aug 10, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

这个实际上是从 5.1.1 开始支持的，也就是可以进入 release-5.1 文档中。那文档中的命令版本是否需要改为 5.1.1 呢？

Copy link
Member Author

Choose a reason for hiding this comment

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

个人不建议归到 5.1 文档中，如果有人不看下面的内容，容易误以为支持所有 5.1.x，playground 并非生产环境，所以从完整的高版本开始推荐使用相对合理。

Copy link
Contributor

Choose a reason for hiding this comment

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

【不建议归到 5.1 文档中】是说不进入 release-5.1 分支文档吗？

Copy link
Member Author

Choose a reason for hiding this comment

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

是的。不进入

Copy link
Contributor

Choose a reason for hiding this comment

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

那这里是否写成【只有 v5.2.0 及以上版本的 TiDB】? 否则认知起来有些混乱

Copy link
Member Author

Choose a reason for hiding this comment

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

有道理，我更改了。

@TomShawn
Copy link
Contributor

/rebase

@TomShawn TomShawn assigned en-jin19 and unassigned TomShawn Aug 11, 2021
@xiaoyangwang5
Copy link
Contributor

LGTM

@TomShawn
Copy link
Contributor

@en-jin19 This PR is ready for translation. Thanks!

@en-jin19 en-jin19 mentioned this pull request Aug 12, 2021
Merged
11 tasks
@en-jin19 en-jin19 added translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. and removed translation/doing This PR’s assignee is translating this PR. labels Aug 12, 2021
TomShawn
TomShawn reviewed Aug 19, 2021
View reviewed changes
quick-start-with-tidb.md Outdated Show resolved Hide resolved
@TomShawn TomShawn added needs-cherry-pick-release-5.2 and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Aug 25, 2021
@TomShawn TomShawn added the require-LGT1 Indicates that the PR requires an LGTM. label Aug 25, 2021
@TomShawn
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: a2e16d4

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 25, 2021
@ti-chi-bot ti-chi-bot merged commit e096035 into pingcap:master Aug 25, 2021
This was referenced Aug 25, 2021
Merged
Merged
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #6958.

ti-chi-bot added a commit that referenced this pull request Aug 25, 2021
@ti-chi-bot
update version and tiup playground supports M1 silicon (#6791) (#6958)
ae27273
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TomShawn TomShawn TomShawn approved these changes

Assignees

@en-jin19 en-jin19

Labels
require-LGT1 Indicates that the PR requires an LGTM. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. v5.2 This PR/issue applies to TiDB v5.2.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@lilyjazz @ti-chi-bot @TomShawn @xiaoyangwang5 @en-jin19