8000 Fix two bugs of changelog checker · nirum-lang/nirum-python@aa3be52 · GitHub
[go: up one dir, main page]

Skip to content

Commit aa3be52

Browse files
committed
Fix two bugs of changelog checker
- "To be released" is usually appeared in CHANGES.rst, not README.rst. - As `git show` doesn't work with `TRAVIS_COMMIT_RANGE` value when amended commit/rebased commits are pushed, it'd better to refer to `TRAVIS_PULL_REQUEST_SHA`/`TRAVIS_TAG`/`TRAVIS_COMMIT` for certain cases instead. [changelog skip]
1 parent 328b4af commit aa3be52

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

.travis.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@ script:
1313
- tox -e docs
1414
- '[[ "$TRAVIS_TAG" = "" ]] || [[ "$TRAVIS_TAG" = "$(python setup.py --version)" ]]'
1515
- |
16-
if git show --format=%B --quiet "$TRAVIS_COMMIT_RANGE$TRAVIS_TAG" | grep '\[changelog skip\]' > /dev/null; then
17-
echo "Skip changelog checker..."
18-
elif [[ "$TRAVIS_TAG" != "" ]]; then
19-
! grep -i "to be released" README.rst
20-
else
21-
[[ "$(git diff --name-only "$TRAVIS_COMMIT_RANGE" | grep CHANGES\.rst)" != "" ]]
22-
fi
16+
if git show --format=%B --quiet "${TRAVIS_PULL_REQUEST_SHA:-${TRAVIS_TAG:-${TRAVIS_COMMIT}}}" \
17+
| grep '\[changelog skip\]' > /dev/null; then
18+
echo "Skip changelog checker..."
19+
elif [[ "$TRAVIS_TAG" != "" ]]; then
20+
! grep -i "to be released" CHANGES.rst
21+
else
22+
[[ "$(git diff --name-only "$TRAVIS_COMMIT_RANGE" | grep CHANGES\.rst)" != "" ]]
23+
fi

0 commit comments

Comments
 (0)
0