Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix check-newsfragment for debian-only changes. (#4825)

This commit is contained in:
Richard van der Hoff 2019-03-07 14:03:05 +00:00 committed by GitHub
parent f6135d06cf
commit 685704536f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/4825.misc Normal file
View File

@ -0,0 +1 @@
Fix check-newsfragment for debian-only changes.

12
scripts-dev/check-newsfragment
View File

@ -7,14 +7,12 @@ set -e
# make sure that origin/develop is up to date # make sure that origin/develop is up to date
git remote set-branches --add origin develop git remote set-branches --add origin develop
git fetch --depth=1 origin develop git fetch origin develop
UPSTREAM=origin/develop
# if there are changes in the debian directory, check that the debian changelog # if there are changes in the debian directory, check that the debian changelog
# has been updated # has been updated
if ! git diff --quiet $UPSTREAM... -- debian; then if ! git diff --quiet FETCH_HEAD... -- debian; then
if git diff --quiet $UPSTREAM... -- debian/changelog; then if git diff --quiet FETCH_HEAD... -- debian/changelog; then
echo "Updates to debian directory, but no update to the changelog." >&2 echo "Updates to debian directory, but no update to the changelog." >&2
exit 1 exit 1
fi fi
@ -22,7 +20,7 @@ fi
# if there are changes *outside* the debian directory, check that the # if there are changes *outside* the debian directory, check that the
# newsfragments have been updated. # newsfragments have been updated.
if git diff --name-only $UPSTREAM... | grep -qv '^develop/'; then if git diff --name-only FETCH_HEAD... | grep -qv '^debian/'; then
tox -e check-newsfragment tox -e check-newsfragment
fi fi
@ -31,7 +29,7 @@ echo "--------------------------"
echo echo
# check that any new newsfiles on this branch end with a full stop. # 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 FETCH_HEAD... -- changelog.d`; do
lastchar=`tr -d '\n' < $f | tail -c 1` lastchar=`tr -d '\n' < $f | tail -c 1`
if [ $lastchar != '.' ]; then if [ $lastchar != '.' ]; then
echo -e "\e[31mERROR: newsfragment $f does not end with a '.'\e[39m" >&2 echo -e "\e[31mERROR: newsfragment $f does not end with a '.'\e[39m" >&2