This is an automated cherry-pick of pingcap#6339

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot · Sep 7, 2021 · 3870915 · 3870915
1 parent 364ca09
commit 3870915
Showing 1 changed file with 25 additions and 0 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -21,14 +21,24 @@ jobs:
           command: |
             git remote add upstream https://github.com/pingcap/docs.git
             git fetch upstream
+<<<<<<< HEAD
             wget https://raw.githubusercontent.com/CharLotteiu/pingcap-docs-checks/main/check-file-encoding.py
             python3 check-file-encoding.py $(git diff-tree --name-only --no-commit-id -r upstream/release-3.1..HEAD -- '*.md' ':(exclude).github/*')
+=======
+            wget https://raw.githubusercontent.com/pingcap/docs/master/scripts/check-file-encoding.py
+            python3 check-file-encoding.py $(git diff-tree --name-only --no-commit-id -r upstream/release-5.2..HEAD -- '*.md' ':(exclude).github/*')
+>>>>>>> 0341970e0 (chore: use py scripts in docs/master (#6339))
 
       - run:
           name: "Check git conflicts"
           command: |
+<<<<<<< HEAD
             wget https://raw.githubusercontent.com/CharLotteiu/pingcap-docs-checks/main/check-conflicts.py
             python3 check-conflicts.py $(git diff-tree --name-only --no-commit-id -r upstream/release-3.1..HEAD -- '*.md' '*.yml' '*.yaml')
+=======
+            wget https://raw.githubusercontent.com/pingcap/docs/master/scripts/check-conflicts.py
+            python3 check-conflicts.py $(git diff-tree --name-only --no-commit-id -r upstream/release-5.2..HEAD -- '*.md' '*.yml' '*.yaml')
+>>>>>>> 0341970e0 (chore: use py scripts in docs/master (#6339))
 
       - run:
           name: "Install markdownlint"
@@ -53,20 +63,35 @@ jobs:
       - run:
           name: "Check control characters"
           command: |
+<<<<<<< HEAD
             wget https://raw.githubusercontent.com/CharLotteiu/pingcap-docs-checks/main/check-control-char.py
             python3 check-control-char.py $(git diff-tree --name-only --no-commit-id -r upstream/release-3.1..HEAD -- '*.md' ':(exclude).github/*')
+=======
+            wget https://raw.githubusercontent.com/pingcap/docs/master/scripts/check-control-char.py
+            python3 check-control-char.py $(git diff-tree --name-only --no-commit-id -r upstream/release-5.2..HEAD -- '*.md' ':(exclude).github/*')
+>>>>>>> 0341970e0 (chore: use py scripts in docs/master (#6339))
 
       - run:
           name: "Check unclosed tags"
           command: |
+<<<<<<< HEAD
             wget https://raw.githubusercontent.com/CharLotteiu/pingcap-docs-checks/main/check-tags.py
             python3 check-tags.py $(git diff-tree --name-only --no-commit-id -r upstream/release-3.1..HEAD -- '*.md' ':(exclude).github/*')
+=======
+            wget https://raw.githubusercontent.com/pingcap/docs/master/scripts/check-tags.py
+            python3 check-tags.py $(git diff-tree --name-only --no-commit-id -r upstream/release-5.2..HEAD -- '*.md' ':(exclude).github/*')
+>>>>>>> 0341970e0 (chore: use py scripts in docs/master (#6339))
 
       - run:
           name: "Check manual line breaks"
           command: |
+<<<<<<< HEAD
             wget https://raw.githubusercontent.com/CharLotteiu/pingcap-docs-checks/main/check-manual-line-breaks.py
             python3 check-manual-line-breaks.py $(git diff-tree --name-only --no-commit-id -r upstream/release-3.1..HEAD -- '*.md' ':(exclude).github/*')
+=======
+            wget https://raw.githubusercontent.com/pingcap/docs/master/scripts/check-manual-line-breaks.py
+            python3 check-manual-line-breaks.py $(git diff-tree --name-only --no-commit-id -r upstream/release-5.2..HEAD -- '*.md' ':(exclude).github/*')
+>>>>>>> 0341970e0 (chore: use py scripts in docs/master (#6339))
 
   build:
     docker: