summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2023-11-08 17:28:14 +0000
committerfeld <feld@feld.me>2023-11-08 17:28:14 +0000
commitaef1a88dc65bbcb46e9244a14d5bbeff9cdbcddc (patch)
tree3f614f685e8c729a6170d098c2e7acdc5ae24829
parent17524865e528e69ee92ab3e3911782d79b4b3be0 (diff)
parentaddc5408ff570db955e06de1fbc4f7963538be04 (diff)
downloadpleroma-aef1a88dc65bbcb46e9244a14d5bbeff9cdbcddc.tar.gz
pleroma-aef1a88dc65bbcb46e9244a14d5bbeff9cdbcddc.zip
Merge branch 'changelogd-fix' into 'develop'
Fix changelogd grep syntax error See merge request pleroma/pleroma!3973
-rw-r--r--tools/check-changelog2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/check-changelog b/tools/check-changelog
index 64e59ae7f..d053ed577 100644
--- a/tools/check-changelog
+++ b/tools/check-changelog
@@ -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