diff --git a/tools/check-changelog b/tools/check-changelog index 9b3ff37f2..69e8b71cb 100644 --- a/tools/check-changelog +++ b/tools/check-changelog @@ -1,12 +1,15 @@ #!/bin/sh +echo "adding ownership exception" +git config --global --add safe.directory "$(pwd)" + echo "looking for change log" git remote add upstream https://git.pleroma.social/pleroma/pleroma-fe.git -git fetch upstream ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}:refs/remotes/upstream/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME +git fetch upstream ${CI_COMMIT_TARGET_BRANCH}:refs/remotes/upstream/${CI_COMMIT_TARGET_BRANCH} -git diff --raw --no-renames upstream/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME HEAD -- changelog.d | \ - grep ' A\t' | grep '\.\(skip\|add\|remove\|change\|fix\|security\)$' +git diff --raw --no-renames upstream/${CI_COMMIT_TARGET_BRANCH} HEAD -- changelog.d | \ + grep ' A\t' | grep '\.\(skip\|add\|remove\|fix\|security\|change\)$' ret=$? if [ $ret -eq 0 ]; then