tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Fix check-newsfragment script (#4750)

Browse source 
* Fix check-newsfragment script

I previously broke this so that it always succeeded...

* more fixes

* fix newsfiles
This commit is contained in:
Richard van der Hoff 2019-02-26 21:13:41 +00:00 committed by Amber Brown
parent 4bc7483518
commit 57426ec6a3
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog.d/4698.misc
View file

@ -1 +1 @@
Better checks on newsfragments
Better checks on newsfragments.

1
changelog.d/4750.misc Normal file
View file

@ -0,0 +1 @@
Better checks on newsfragments.

11
scripts-dev/check-newsfragment
View file

@ -6,7 +6,8 @@
set -e
# make sure that origin/develop is up to date
git fetch origin develop
git remote set-branches --add origin develop
git fetch --depth=1 origin develop
UPSTREAM=origin/develop
@ -25,11 +26,15 @@ if git diff --name-only $UPSTREAM... | grep -qv '^develop/'; then
tox -e check-newsfragment
fi
echo
echo "--------------------------"
echo
# check that any new newsfiles on this branch end with a full stop.
for f in git diff --name-only $UPSTREAM... -- changelog.d; do
for f in `git diff --name-only $UPSTREAM... -- changelog.d`; do
lastchar=`tr -d '\n' < $f | tail -c 1`
if [ $lastchar != '.' ]; then
echo "Newsfragment $f does not end with a '.'" >&2
echo -e "\e[31mERROR: newsfragment $f does not end with a '.'\e[39m" >&2
exit 1
fi
done