Parcourir la source

Fix check-newsfragment script (#4750)

* Fix check-newsfragment script

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

* more fixes

* fix newsfiles
tags/v0.99.2rc1
Richard van der Hoff il y a 5 ans
committed by Amber Brown
Parent
révision
57426ec6a3
3 fichiers modifiés avec 10 ajouts et 4 suppressions
  1. +1
    -1
      changelog.d/4698.misc
  2. +1
    -0
      changelog.d/4750.misc
  3. +8
    -3
      scripts-dev/check-newsfragment

+ 1
- 1
changelog.d/4698.misc Voir le fichier

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

+ 1
- 0
changelog.d/4750.misc Voir le fichier

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

+ 8
- 3
scripts-dev/check-newsfragment Voir le fichier

@@ -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


Chargement…
Annuler
Enregistrer