diff options
| author | feld <feld@feld.me> | 2024-02-15 15:27:34 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2024-02-15 15:27:34 +0000 |
| commit | 03834454d92a9aa8776e604b5329a23bc8a5430b (patch) | |
| tree | 33aa9ec247271eba0bc06ec9f22ad5e1f496622a /tools | |
| parent | b91317b9bf5a615ab9655f8066abf70040eaf8d3 (diff) | |
| parent | 2a4fa4c408d874d8b938f780337d2956b6f0101f (diff) | |
| download | pleroma-03834454d92a9aa8776e604b5329a23bc8a5430b.tar.gz pleroma-03834454d92a9aa8776e604b5329a23bc8a5430b.zip | |
Merge branch 'tesla' into 'develop'
Update Tesla, document some deps changes
See merge request pleroma/pleroma!4069
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/check-changelog | 2 | ||||
| -rwxr-xr-x | tools/collect-changelog | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/check-changelog b/tools/check-changelog index d053ed577..28ef8454e 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 '\.\(add\|change\|deps\|fix\|remove\|security\)$' ret=$? if [ $ret -eq 0 ]; then diff --git a/tools/collect-changelog b/tools/collect-changelog index 1e12d5640..d0e4905d4 100755 --- a/tools/collect-changelog +++ b/tools/collect-changelog @@ -23,5 +23,6 @@ collectType change Changed collectType add Added collectType fix Fixed collectType remove Removed +collectType deps Dependencies rm changelog.d/* |