From 11bd48c3ca615a9d869c57b924b3a349d1b8c43d 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 0bce18d28bf15..0c5d03d33116c 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.0..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.0..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.0..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.0..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.0..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 59f897b312d3c24baa8dc9e1435f5d666b315bdc Mon Sep 17 00:00:00 2001 From: TomShawn <41534398+TomShawn@users.noreply.github.com> Date: Thu, 9 Sep 2021 18:15:53 +0800 Subject: [PATCH 2/2] Apply suggestions from code review --- .circleci/config.yml | 36 ++++++------------------------------ 1 file changed, 6 insertions(+), 30 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0c5d03d33116c..a04fb1a70a16c 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.0..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.0..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.0..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.0..HEAD -- '*.md' '*.yml' '*.yaml') - run: name: "Install markdownlint" @@ -63,35 +53,21 @@ 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.0..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.0..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.0..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.0..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.0..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.0..HEAD -- '*.md' ':(exclude).github/*') build: docker: