diff options
| author | feld <feld@feld.me> | 2024-02-16 17:53:52 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2024-02-16 17:53:52 +0000 |
| commit | 0fbec6b532330e86da9b396f31f9d5dd04990a9e (patch) | |
| tree | 8e557f7277bb0605f24599e44fe15c340aa1d960 /tools | |
| parent | 03834454d92a9aa8776e604b5329a23bc8a5430b (diff) | |
| parent | 1951d56ed9651abc8f6a9d4dc02b7f976274415f (diff) | |
| download | pleroma-0fbec6b532330e86da9b396f31f9d5dd04990a9e.tar.gz pleroma-0fbec6b532330e86da9b396f31f9d5dd04990a9e.zip | |
Merge branch 'deps-changelog-revert' into 'develop'
Revert "Support a new changelog entry type: deps"
See merge request pleroma/pleroma!4071
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/check-changelog | 2 | ||||
| -rwxr-xr-x | tools/collect-changelog | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tools/check-changelog b/tools/check-changelog index 28ef8454e..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 '\.\(add\|change\|deps\|fix\|remove\|security\)$' + grep ' A\t' | grep '\.\(skip\|add\|remove\|fix\|security\|change\)$' ret=$? if [ $ret -eq 0 ]; then diff --git a/tools/collect-changelog b/tools/collect-changelog index d0e4905d4..1e12d5640 100755 --- a/tools/collect-changelog +++ b/tools/collect-changelog @@ -23,6 +23,5 @@ collectType change Changed collectType add Added collectType fix Fixed collectType remove Removed -collectType deps Dependencies rm changelog.d/* |