v6.5-v8.1: update download URL from pingcap.org to pingcap.com (#22241) #22282
Conversation
ti-chi-bot
added
do-not-merge/hold
|
@Oreoxmt This PR has conflicts, I have hold it. |
|
@ti-chi-bot: ## If you want to know how to resolve it, please read the guide in TiDB Dev Guide. DetailsInstructions 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. |
Summary of ChangesHello @ti-chi-bot, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request systematically updates all download links within the documentation that previously pointed to Highlights
🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console. Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here. You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension. Footnotes
|
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request aims to update download URLs from pingcap.org to pingcap.com. While the intent is clear, the changes have introduced several merge conflicts across multiple files. These conflicts must be resolved before the PR can be merged. My review focuses on pointing out these conflicts and suggesting the correct resolution, which is generally to adopt the changes that update the domain to pingcap.com and use version variables where appropriate.
deploy-monitoring-services.md
Outdated
| <<<<<<< HEAD | ||
| wget https://github.com/prometheus/prometheus/releases/download/v2.49.1/prometheus-2.49.1.linux-amd64.tar.gz | ||
| wget https://download.pingcap.org/node_exporter-v1.3.1-linux-amd64.tar.gz | ||
| wget https://download.pingcap.org/grafana-7.5.17.linux-amd64.tar.gz | ||
| ======= | ||
| wget https://download.pingcap.com/prometheus-2.27.1.linux-amd64.tar.gz | ||
| wget https://download.pingcap.com/node_exporter-v1.3.1-linux-amd64.tar.gz | ||
| wget https://download.pingcap.com/grafana-7.5.11.linux-amd64.tar.gz | ||
| >>>>>>> e6cc410e73 (v6.5-v8.1: update download URL from pingcap.org to pingcap.com (#22241)) |
There was a problem hiding this comment.
This file contains merge conflict markers that need to be resolved. It seems the intention is to update the download URLs to use pingcap.com and update the component versions. Please resolve the conflict.
| <<<<<<< HEAD | |
| wget https://github.com/prometheus/prometheus/releases/download/v2.49.1/prometheus-2.49.1.linux-amd64.tar.gz | |
| wget https://download.pingcap.org/node_exporter-v1.3.1-linux-amd64.tar.gz | |
| wget https://download.pingcap.org/grafana-7.5.17.linux-amd64.tar.gz | |
| ======= | |
| wget https://download.pingcap.com/prometheus-2.27.1.linux-amd64.tar.gz | |
| wget https://download.pingcap.com/node_exporter-v1.3.1-linux-amd64.tar.gz | |
| wget https://download.pingcap.com/grafana-7.5.11.linux-amd64.tar.gz | |
| >>>>>>> e6cc410e73 (v6.5-v8.1: update download URL from pingcap.org to pingcap.com (#22241)) | |
| wget https://download.pingcap.com/prometheus-2.27.1.linux-amd64.tar.gz | |
| wget https://download.pingcap.com/node_exporter-v1.3.1-linux-amd64.tar.gz | |
| wget https://download.pingcap.com/grafana-7.5.11.linux-amd64.tar.gz |
dm/quick-start-create-task.md
Outdated
| <<<<<<< HEAD | ||
| wget https://download.pingcap.org/tidb-community-server-v8.1.2-linux-amd64.tar.gz | ||
| ======= | ||
| wget https://download.pingcap.com/tidb-community-server-v{{{ .tidb-version }}}-linux-amd64.tar.gz | ||
| >>>>>>> e6cc410e73 (v6.5-v8.1: update download URL from pingcap.org to pingcap.com (#22241)) |
There was a problem hiding this comment.
This file contains merge conflict markers that need to be resolved. The version with the {{{ .tidb-version }}} variable and the pingcap.com domain seems to be the correct one for documentation that spans multiple versions. Please resolve the conflict.
| <<<<<<< HEAD | |
| wget https://download.pingcap.org/tidb-community-server-v8.1.2-linux-amd64.tar.gz | |
| ======= | |
| wget https://download.pingcap.com/tidb-community-server-v{{{ .tidb-version }}}-linux-amd64.tar.gz | |
| >>>>>>> e6cc410e73 (v6.5-v8.1: update download URL from pingcap.org to pingcap.com (#22241)) | |
| wget https://download.pingcap.com/tidb-community-server-v{{{ .tidb-version }}}-linux-amd64.tar.gz |
download-ecosystem-tools.md
Outdated
| <<<<<<< HEAD | ||
| `{version}` in the link indicates the version number of TiDB and `{arch}` indicates the architecture of the system, which can be `amd64` or `arm64`. For example, the download link for `v8.1.2` in the `amd64` architecture is `https://download.pingcap.org/tidb-community-toolkit-v8.1.2-linux-amd64.tar.gz`. | ||
| ======= | ||
| `{version}` in the link indicates the version number of TiDB and `{arch}` indicates the architecture of the system, which can be `amd64` or `arm64`. For example, the download link for `v6.2.0` in the `amd64` architecture is `https://download.pingcap.com/tidb-community-toolkit-v6.2.0-linux-amd64.tar.gz`. | ||
| >>>>>>> e6cc410e73 (v6.5-v8.1: update download URL from pingcap.org to pingcap.com (#22241)) |
There was a problem hiding this comment.
This file contains merge conflict markers. The example URL in the HEAD block also incorrectly uses pingcap.org. Please resolve the conflict, ensuring the pingcap.com domain is used throughout.
| <<<<<<< HEAD | |
| `{version}` in the link indicates the version number of TiDB and `{arch}` indicates the architecture of the system, which can be `amd64` or `arm64`. For example, the download link for `v8.1.2` in the `amd64` architecture is `https://download.pingcap.org/tidb-community-toolkit-v8.1.2-linux-amd64.tar.gz`. | |
| ======= | |
| `{version}` in the link indicates the version number of TiDB and `{arch}` indicates the architecture of the system, which can be `amd64` or `arm64`. For example, the download link for `v6.2.0` in the `amd64` architecture is `https://download.pingcap.com/tidb-community-toolkit-v6.2.0-linux-amd64.tar.gz`. | |
| >>>>>>> e6cc410e73 (v6.5-v8.1: update download URL from pingcap.org to pingcap.com (#22241)) | |
| `{version}` in the link indicates the version number of TiDB and `{arch}` indicates the architecture of the system, which can be `amd64` or `arm64`. For example, the download link for `v6.2.0` in the `amd64` architecture is `https://download.pingcap.com/tidb-community-toolkit-v6.2.0-linux-amd64.tar.gz`. |
pd-control.md
Outdated
| <<<<<<< HEAD | ||
| > `{version}` in the link indicates the version number of TiDB. For example, the download link for `v8.1.2` in the `amd64` architecture is `https://download.pingcap.org/tidb-community-server-v8.1.2-linux-amd64.tar.gz`. | ||
| ======= | ||
| > `{version}` in the link indicates the version number of TiDB. For example, the download link for `v{{{ .tidb-version }}}` in the `amd64` architecture is `https://download.pingcap.com/tidb-community-server-v{{{ .tidb-version }}}-linux-amd64.tar.gz`. | ||
| >>>>>>> e6cc410e73 (v6.5-v8.1: update download URL from pingcap.org to pingcap.com (#22241)) |
There was a problem hiding this comment.
This file contains merge conflict markers. The example URL in the HEAD block also incorrectly uses pingcap.org. Please resolve the conflict, ensuring the pingcap.com domain is used and the version is represented by a variable for better maintainability across different documentation versions.
| <<<<<<< HEAD | |
| > `{version}` in the link indicates the version number of TiDB. For example, the download link for `v8.1.2` in the `amd64` architecture is `https://download.pingcap.org/tidb-community-server-v8.1.2-linux-amd64.tar.gz`. | |
| ======= | |
| > `{version}` in the link indicates the version number of TiDB. For example, the download link for `v{{{ .tidb-version }}}` in the `amd64` architecture is `https://download.pingcap.com/tidb-community-server-v{{{ .tidb-version }}}-linux-amd64.tar.gz`. | |
| >>>>>>> e6cc410e73 (v6.5-v8.1: update download URL from pingcap.org to pingcap.com (#22241)) | |
| > `{version}` in the link indicates the version number of TiDB. For example, the download link for `v{{{ .tidb-version }}}` in the `amd64` architecture is `https://download.pingcap.com/tidb-community-server-v{{{ .tidb-version }}}-linux-amd64.tar.gz`. |
production-deployment-using-tiup.md
Outdated
| <<<<<<< HEAD | ||
| > `{version}` in the link indicates the version number of TiDB and `{arch}` indicates the architecture of the system, which can be `amd64` or `arm64`. For example, the download link for `v8.1.2` in the `amd64` architecture is `https://download.pingcap.org/tidb-community-toolkit-v8.1.2-linux-amd64.tar.gz`. | ||
| ======= | ||
| > `{version}` in the link indicates the version number of TiDB and `{arch}` indicates the architecture of the system, which can be `amd64` or `arm64`. For example, the download link for `v7.5.0` in the `amd64` architecture is `https://download.pingcap.com/tidb-community-toolkit-v7.5.0-linux-amd64.tar.gz`. | ||
| >>>>>>> e6cc410e73 (v6.5-v8.1: update download URL from pingcap.org to pingcap.com (#22241)) |
There was a problem hiding this comment.
This file contains merge conflict markers. The example URL in the HEAD block also incorrectly uses pingcap.org. Please resolve the conflict, ensuring the pingcap.com domain is used throughout.
| <<<<<<< HEAD | |
| > `{version}` in the link indicates the version number of TiDB and `{arch}` indicates the architecture of the system, which can be `amd64` or `arm64`. For example, the download link for `v8.1.2` in the `amd64` architecture is `https://download.pingcap.org/tidb-community-toolkit-v8.1.2-linux-amd64.tar.gz`. | |
| ======= | |
| > `{version}` in the link indicates the version number of TiDB and `{arch}` indicates the architecture of the system, which can be `amd64` or `arm64`. For example, the download link for `v7.5.0` in the `amd64` architecture is `https://download.pingcap.com/tidb-community-toolkit-v7.5.0-linux-amd64.tar.gz`. | |
| >>>>>>> e6cc410e73 (v6.5-v8.1: update download URL from pingcap.org to pingcap.com (#22241)) | |
| > `{version}` in the link indicates the version number of TiDB and `{arch}` indicates the architecture of the system, which can be `amd64` or `arm64`. For example, the download link for `v7.5.0` in the `amd64` architecture is `https://download.pingcap.com/tidb-community-toolkit-v7.5.0-linux-amd64.tar.gz`. |
| <<<<<<< HEAD | ||
| curl -L https://download.pingcap.org/tidb-community-server-v8.1.2-linux-amd64.tar.gz | tar xzf - | ||
| ======= | ||
| curl -L https://download.pingcap.com/tidb-community-server-v{{{ .tidb-version }}}-linux-amd64.tar.gz | tar xzf - | ||
| >>>>>>> e6cc410e73 (v6.5-v8.1: update download URL from pingcap.org to pingcap.com (#22241)) |
There was a problem hiding this comment.
This file contains merge conflict markers that need to be resolved. The version with the {{{ .tidb-version }}} variable and the pingcap.com domain seems to be the correct one for documentation that spans multiple versions. Please resolve the conflict.
| <<<<<<< HEAD | |
| curl -L https://download.pingcap.org/tidb-community-server-v8.1.2-linux-amd64.tar.gz | tar xzf - | |
| ======= | |
| curl -L https://download.pingcap.com/tidb-community-server-v{{{ .tidb-version }}}-linux-amd64.tar.gz | tar xzf - | |
| >>>>>>> e6cc410e73 (v6.5-v8.1: update download URL from pingcap.org to pingcap.com (#22241)) | |
| curl -L https://download.pingcap.com/tidb-community-server-v{{{ .tidb-version }}}-linux-amd64.tar.gz | tar xzf - |
upgrade-monitoring-services.md
Outdated
| <<<<<<< HEAD | ||
| > `{version}` in the link indicates the version number of TiDB and `{arch}` indicates the architecture of the system, which can be `amd64` or `arm64`. For example, the download link for `v8.1.2` in the `amd64` architecture is `https://download.pingcap.org/tidb-community-toolkit-v8.1.2-linux-amd64.tar.gz`. | ||
| ======= | ||
| > `{version}` in the link indicates the version number of TiDB and `{arch}` indicates the architecture of the system, which can be `amd64` or `arm64`. For example, the download link for `v{{{ .tidb-version }}}` in the `amd64` architecture is `https://download.pingcap.com/tidb-community-toolkit-v{{{ .tidb-version }}}-linux-amd64.tar.gz`. | ||
| >>>>>>> e6cc410e73 (v6.5-v8.1: update download URL from pingcap.org to pingcap.com (#22241)) |
There was a problem hiding this comment.
This file contains merge conflict markers. The example URL in the HEAD block also incorrectly uses pingcap.org. Please resolve the conflict, ensuring the pingcap.com domain is used and the version is represented by a variable for better maintainability across different documentation versions.
| <<<<<<< HEAD | |
| > `{version}` in the link indicates the version number of TiDB and `{arch}` indicates the architecture of the system, which can be `amd64` or `arm64`. For example, the download link for `v8.1.2` in the `amd64` architecture is `https://download.pingcap.org/tidb-community-toolkit-v8.1.2-linux-amd64.tar.gz`. | |
| ======= | |
| > `{version}` in the link indicates the version number of TiDB and `{arch}` indicates the architecture of the system, which can be `amd64` or `arm64`. For example, the download link for `v{{{ .tidb-version }}}` in the `amd64` architecture is `https://download.pingcap.com/tidb-community-toolkit-v{{{ .tidb-version }}}-linux-amd64.tar.gz`. | |
| >>>>>>> e6cc410e73 (v6.5-v8.1: update download URL from pingcap.org to pingcap.com (#22241)) | |
| > `{version}` in the link indicates the version number of TiDB and `{arch}` indicates the architecture of the system, which can be `amd64` or `arm64`. For example, the download link for `v{{{ .tidb-version }}}` in the `amd64` architecture is `https://download.pingcap.com/tidb-community-toolkit-v{{{ .tidb-version }}}-linux-amd64.tar.gz`. |
upgrade-monitoring-services.md
Outdated
| <<<<<<< HEAD | ||
| > `{version}` in the link indicates the version number of TiDB and `{arch}` indicates the architecture of the system, which can be `amd64` or `arm64`. For example, the download link for `v8.1.2` in the `amd64` architecture is `https://download.pingcap.org/tidb-community-toolkit-v8.1.2-linux-amd64.tar.gz`. | ||
| ======= | ||
| > `{version}` in the link indicates the version number of TiDB and `{arch}` indicates the architecture of the system, which can be `amd64` or `arm64`. For example, the download link for `v{{{ .tidb-version }}}` in the `amd64` architecture is `https://download.pingcap.com/tidb-community-toolkit-v{{{ .tidb-version }}}-linux-amd64.tar.gz`. | ||
| >>>>>>> e6cc410e73 (v6.5-v8.1: update download URL from pingcap.org to pingcap.com (#22241)) |
There was a problem hiding this comment.
This file contains another instance of merge conflict markers. The example URL in the HEAD block also incorrectly uses pingcap.org. Please resolve the conflict, ensuring the pingcap.com domain is used and the version is represented by a variable for better maintainability across different documentation versions.
| <<<<<<< HEAD | |
| > `{version}` in the link indicates the version number of TiDB and `{arch}` indicates the architecture of the system, which can be `amd64` or `arm64`. For example, the download link for `v8.1.2` in the `amd64` architecture is `https://download.pingcap.org/tidb-community-toolkit-v8.1.2-linux-amd64.tar.gz`. | |
| ======= | |
| > `{version}` in the link indicates the version number of TiDB and `{arch}` indicates the architecture of the system, which can be `amd64` or `arm64`. For example, the download link for `v{{{ .tidb-version }}}` in the `amd64` architecture is `https://download.pingcap.com/tidb-community-toolkit-v{{{ .tidb-version }}}-linux-amd64.tar.gz`. | |
| >>>>>>> e6cc410e73 (v6.5-v8.1: update download URL from pingcap.org to pingcap.com (#22241)) | |
| > `{version}` in the link indicates the version number of TiDB and `{arch}` indicates the architecture of the system, which can be `amd64` or `arm64`. For example, the download link for `v{{{ .tidb-version }}}` in the `amd64` architecture is `https://download.pingcap.com/tidb-community-toolkit-v{{{ .tidb-version }}}-linux-amd64.tar.gz`. |
Oreoxmt
force-pushed
the
cherry-pick-22241-to-release-8.1
branch
from
c413272 to
d8caa20
Compare
|
/approve |
|
/unhols |
|
/unhold |
ti-chi-bot
bot
removed
the
do-not-merge/hold
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: Oreoxmt The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
2 participants
This is an automated cherry-pick of #22241
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).
What is the related PR or file link(s)?
Do your changes match any of the following descriptions?