From 92d799ea5a6ffc2891c7f42f448b45740ffb2aa9 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sat, 16 Jan 2021 18:59:42 +0100 Subject: [PATCH] Automated changelog: just link to github for automated builds Change-Id: I5aa98f07a6c2053fe263d26f9d2265fb2193afef --- increment_version.sh | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/increment_version.sh b/increment_version.sh index b41377f133..4413a14a31 100755 --- a/increment_version.sh +++ b/increment_version.sh @@ -128,15 +128,22 @@ set_prop "versionName" "\"$version\"" changelog_dir=fastlane/metadata/android/en-US/changelogs changelog_file="$changelog_dir/$versionCode.txt" mkdir -p "$changelog_dir" -git log --reverse --pretty=format:"- %s" "$last_tag".. --committer="$(git config user.name)" \ - | grep -v 'Automatic revert to unchanged upstream strings' \ - | grep -v 'Automatic upstream merge preparation' \ - | sed "s|Merge tag '\\(.*\\)' into sc|Update codebase to Element \1|" \ - | grep -v "Automatic color correction" \ - | grep -v "Automatic upstream merge postprocessing" \ - | grep -v "Automatic SchildiChat string correction" \ - | grep -v 'merge_helpers\|README\|increment_version' \ - > "$changelog_file" +if [ "$release_type" = "test" ]; then + # Automated changelog is usually too long for F-Droid changelog + current_commit="$(git rev-parse HEAD)" + echo "Full changelog: https://github.com/SchildiChat/SchildiChat-android/commits/$current_commit" \ + > "$changelog_file" +else + git log --reverse --pretty=format:"- %s" "$last_tag".. --committer="$(git config user.name)" \ + | grep -v 'Automatic revert to unchanged upstream strings' \ + | grep -v 'Automatic upstream merge preparation' \ + | sed "s|Merge tag '\\(.*\\)' into sc|Update codebase to Element \1|" \ + | grep -v "Automatic color correction" \ + | grep -v "Automatic upstream merge postprocessing" \ + | grep -v "Automatic SchildiChat string correction" \ + | grep -v 'merge_helpers\|README\|increment_version' \ + > "$changelog_file" +fi if [ "$release_type" != "test" ]; then $EDITOR "$changelog_file" || true read -p "Press enter when changelog is done"