Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
qqqdan committed Jul 11, 2023
2 parents 527def7 + 18d13c0 commit 18a412e
Show file tree
Hide file tree
Showing 260 changed files with 6,975 additions and 2,072 deletions.
3 changes: 2 additions & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ By default, **CHOOSE MASTER ONLY** so your changes will be applied to the next T
For details, see [tips for choosing the affected versions (in Chinese)](https://github.com/pingcap/docs-cn/blob/master/CONTRIBUTING.md#版本选择指南).

- [ ] master (the latest development version)
- [ ] v7.3 (TiDB 7.3 versions)
- [ ] v7.2 (TiDB 7.2 versions)
- [ ] v7.1 (TiDB 7.1 versions)
- [ ] v7.0 (TiDB 7.0 versions)
- [ ] v6.6 (TiDB 6.6 versions)
- [ ] v6.5 (TiDB 6.5 versions)
- [ ] v6.1 (TiDB 6.1 versions)
- [ ] v5.4 (TiDB 5.4 versions)
Expand Down
13 changes: 12 additions & 1 deletion .github/workflows/dispatch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,18 @@ on:
- ".github/**"
branches:
- master
- release-*
- release-7.2
- release-7.1
- release-7.0
- release-6.5
- release-6.1
- release-5.4
- release-5.3
- release-5.2
- release-5.1
- release-5.0
- release-4.0
- release-3.0

jobs:
trigger:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/link-fail-fast.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Link Checker
if: ${{ steps.changed-files.outputs.all_changed_files }}
uses: lycheeverse/lychee-action@v1.5.0
uses: lycheeverse/lychee-action@v1.6.1
with:
fail: true
args: -E --exclude-mail -i -n -t 45 -- '${{ steps.changed-files.outputs.all_changed_files }}'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/link.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
curl https://raw.githubusercontent.com/pingcap/docs/master/.lycheeignore --output .lycheeignore
- name: Check Links
uses: lycheeverse/lychee-action@v1.5.0
uses: lycheeverse/lychee-action@v1.6.1
with:
# For parameter description, see https://github.com/lycheeverse/lychee#commandline-parameters
args: -E --exclude-mail -v -i -n -t 45 -- **/*.md *.md
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/media.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
name: Upload media files
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- uses: actions/checkout@v3
with:
# Must use at least depth 2!
fetch-depth: 2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rebase.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout the latest code
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
token: ${{ secrets.REBASE_SECRET_KEY }}
fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
Expand Down
54 changes: 54 additions & 0 deletions OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
# See the OWNERS docs at https://go.k8s.io/owners
approvers:
- breezewish
- CaitinChen
- CharLotteiu
- cofyc
- csuzhangxc
- DanielZhangQD
- dcalvin
- dragonly
- en-jin19
- hfxsd
- jackysp
- kissmydb
- lance6716
- lichunzhu
- lilin90
- Liuxiaozhen12
- morgo
- Oreoxmt
- overvenus
- qiancai
- queenypingcap
- ran-huang
- shichun-0415
- SunRunAway
- tangenta
- TomShawn
- toutdesuite
- WangXiangUSTC
- yikeke
- YiniXu9506
reviewers:
- 3pointer
- amyangfei
- anotherrachel
- aylei
- crazycs520
- dveeden
- ericsyh
- glkappe
- GMHDBJD
- Icemap
- Joyinqin
- junlan-zhang
- KanShiori
- lucklove
- lysu
- ngaut
- superlzs0476
- tiancaiamao
- weekface
- Yisaer
- zimulala
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
| 文档仓库 branch | 对应 TiDB 文档版本 |
|:---------|:----------|
| [`master`](https://github.com/pingcap/docs-cn/tree/master) | dev 最新开发版 |
| [`release-7.2`](https://github.com/pingcap/docs-cn/tree/release-7.2) | 7.2 开发里程碑版 (DMR) |
| [`release-7.1`](https://github.com/pingcap/docs-cn/tree/release-7.1) | 7.1 长期支持版 (LTS) |
| [`release-7.0`](https://github.com/pingcap/docs-cn/tree/release-7.0) | 7.0 开发里程碑版 (DMR) |
| [`release-6.6`](https://github.com/pingcap/docs-cn/tree/release-6.6) | 6.6 开发里程碑版 (DMR) |
| [`release-6.5`](https://github.com/pingcap/docs-cn/tree/release-6.5) | 6.5 长期支持版 (LTS) |
Expand Down
Loading

0 comments on commit 18a412e

Please sign in to comment.