Merge branch 'changelogd-fix' into 'develop'

Fix changelogd grep syntax error

See merge request pleroma/pleroma!3973
This commit is contained in:
feld 2023-11-08 17:28:14 +00:00
commit aef1a88dc6
1 changed files with 1 additions and 1 deletions

View File

@ -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 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 | \ 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=$? ret=$?
if [ $ret -eq 0 ]; then if [ $ret -eq 0 ]; then