Skip to content

Commit

Permalink
CI: update conflicts check to support yml and yaml files (#854)
Browse files Browse the repository at this point in the history
* update conflicts check and add test file

* delete test file
  • Loading branch information
CharLotteiu authored Nov 16, 2020
1 parent e4f2f1c commit 25938d0
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
pull:
runs-on: ubuntu-latest
steps:
- name: Check out
- name: Check out
uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
Expand All @@ -16,7 +16,7 @@ jobs:
run:
git remote add upstream https://github.com/pingcap/docs-tidb-operator.git;
git fetch upstream;
python3 ./hack/check-conflicts.py $(git diff-tree --name-only --no-commit-id -r upstream/master...HEAD -- 'zh/' 'en/' '.md' ':(exclude).github/*')
python3 ./hack/check-conflicts.py $(git diff-tree --name-only --no-commit-id -r upstream/master...HEAD -- '*.md' '*.yml' '*.yaml')
- name: Markdown lint
uses: avto-dev/markdown-lint@v1
with:
Expand All @@ -25,8 +25,8 @@ jobs:
- name: Verify internal links
run: ./hack/verify-links.sh
- name: Verify internal link anchors
run: ./hack/verify-link-anchors.sh
run: ./hack/verify-link-anchors.sh
- name: "Check unclosed tags"
run:
run:
echo "checked files are $(git diff-tree --name-only --no-commit-id -r upstream/master...HEAD -- 'zh/' 'en/' '.md' ':(exclude).github/*')";
python3 ./hack/check-tags.py $(git diff-tree --name-only --no-commit-id -r upstream/master...HEAD -- 'zh/' 'en/' '.md' ':(exclude).github/*')

0 comments on commit 25938d0

Please sign in to comment.