Commit aef1a88d authored by feld's avatar feld
Browse files

Merge branch 'changelogd-fix' into 'develop' 

Fix changelogd grep syntax error

See merge request pleroma/pleroma!3973
parents 17524865 addc5408

tools/check-changelog

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ git remote add upstream https://git.pleroma.social/pleroma/pleroma.git 
git fetch upstream ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}:refs/remotes/upstream/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME



git diff --raw --no-renames upstream/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME HEAD -- changelog.d | \

    grep ' A\t' | grep '\.\(skip\|add\|remove\|fix\|security|change\)$'

    grep ' A\t' | grep '\.\(skip\|add\|remove\|fix\|security\|change\)$'

ret=$?



if [ $ret -eq 0 ]; then