From 38709151fc919afff5ccb6d3323a6e83cc37b34f Mon Sep 17 00:00:00 2001 From: TomShawn <41534398+TomShawn@users.noreply.github.com> Date: Tue, 7 Sep 2021 10:54:57 +0800 Subject: [PATCH 1/2] This is an automated cherry-pick of #6339 Signed-off-by: ti-chi-bot --- .circleci/config.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index a492498dda02b..f10bfca9b6106 100644 --- 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: From 6235744bd9ba4e27a21f41b6b2719d5ac0c73f52 Mon Sep 17 00:00:00 2001 From: TomShawn <41534398+TomShawn@users.noreply.github.com> Date: Tue, 7 Sep 2021 11:09:49 +0800 Subject: [PATCH 2/2] Apply suggestions from code review --- .circleci/config.yml | 35 +++++------------------------------ 1 file changed, 5 insertions(+), 30 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f10bfca9b6106..314883a27612f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,24 +21,14 @@ 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)) + python3 check-file-encoding.py $(git diff-tree --name-only --no-commit-id -r upstream/release-3.1..HEAD -- '*.md' ':(exclude).github/*') - 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)) + python3 check-conflicts.py $(git diff-tree --name-only --no-commit-id -r upstream/release-3.1..HEAD -- '*.md' '*.yml' '*.yaml') - run: name: "Install markdownlint" @@ -63,35 +53,20 @@ 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)) + python3 check-control-char.py $(git diff-tree --name-only --no-commit-id -r upstream/release-3.1..HEAD -- '*.md' ':(exclude).github/*') - 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)) + python3 check-tags.py $(git diff-tree --name-only --no-commit-id -r upstream/release-3.1..HEAD -- '*.md' ':(exclude).github/*') - 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)) + python3 check-manual-line-breaks.py $(git diff-tree --name-only --no-commit-id -r upstream/release-3.1..HEAD -- '*.md' ':(exclude).github/*') build: docker: