Fix fdroid changelog generation

May still be broken for split ABI, but at least works again for
universal apk now

Change-Id: Ib04b56effc23cb05645040f8981d6b0e23188495
This commit is contained in:
SpiritCroc 2023-07-26 12:03:08 +02:00
parent 97eafeadcc
commit fa48365aaa

View File

@ -113,9 +113,11 @@ fi
new_tag="sc_v$version" new_tag="sc_v$version"
# Append 0 for universal apk
universalVersionCode="${versionCode}0"
if ((preview)); then if ((preview)); then
# Append 0 for universal apk echo "versionCode ${universalVersionCode}"
echo "versionCode ${versionCode}0"
echo "versionName $version" echo "versionName $version"
exit 0 exit 0
fi fi
@ -151,12 +153,13 @@ git_changelog() {
| grep -v "weblate/sc" \ | grep -v "weblate/sc" \
| grep -v "\\[.*merge.*\\]" \ | grep -v "\\[.*merge.*\\]" \
| grep -v "Disable Android Auto supports" \ | grep -v "Disable Android Auto supports" \
| grep -v "Switch to alternative Schil" \
| grep -v "\\[gplay-release\\]" \ | grep -v "\\[gplay-release\\]" \
|| echo "No significant changes since the last stable release" || echo "No significant changes since the last stable release"
} }
changelog_dir=fastlane/metadata/android/en-US/changelogs changelog_dir=fastlane/metadata/android/en-US/changelogs
changelog_file="$changelog_dir/$versionCode.txt" changelog_file="$changelog_dir/$universalVersionCode.txt"
mkdir -p "$changelog_dir" mkdir -p "$changelog_dir"
if [ "$release_type" = "test" ]; then if [ "$release_type" = "test" ]; then
git_changelog > "$changelog_file" git_changelog > "$changelog_file"
@ -189,7 +192,7 @@ done
git add -A git add -A
if [ "$release_type" = "test" ]; then if [ "$release_type" = "test" ]; then
git commit -m "Test version $versionCode" git commit -m "Test version $universalVersionCode"
else else
git commit -m "Increment version" git commit -m "Increment version"
git tag "$new_tag" git tag "$new_tag"