Skip to content

Commit

Permalink
Fix newsfile CI check (#993)
Browse files Browse the repository at this point in the history
Turns out this check, introduced in #990, didn't actually work right.
  • Loading branch information
richvdh authored Mar 9, 2022
1 parent dfdc840 commit 4da11a9
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions scripts/check-newsfragments
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,12 @@ matched=0

# assume that anything in the changelogs directory which starts with a number
# is intended as a newsfile.
find changelogs -regex '.*/[0-9]+\.[^/]+$' | while read f; do
#
# (we use the < <(...) syntax rather than a regular pipe to avoid spawning a
# subshell for the while loop, which would mean that changes to shell variables
# are not propagated)
#
while read f; do
basename=$(basename $f)
dirname=$(dirname $f)

Expand All @@ -26,7 +31,7 @@ find changelogs -regex '.*/[0-9]+\.[^/]+$' | while read f; do
# see if this newsfile corresponds to the right PR
[[ -n "$pr" && "$basename" == "$pr".* ]] && matched=1
fi
done
done < <(find changelogs -regex '.*/[0-9]+\.[^/]+$')

if [[ -n "$pr" && "$matched" -eq 0 ]]; then
echo -e "\e[31mERROR: Did not find a news fragment with the right number: expected changelogs/*/newsfragments/$pr.*\e[39m" >&2
Expand Down

0 comments on commit 4da11a9

Please sign in to comment.