From dab8f0b51c923cd51315a7d2afdf539dbb37db05 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sat, 1 Apr 2023 11:23:33 +0200 Subject: [PATCH] increment_version.sh: weblate now auto-pushes, no need to manage here Change-Id: I1d671cc682e02c9e8bc29634471ac18c2e41c112 --- increment_version.sh | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/increment_version.sh b/increment_version.sh index fd316812ca..1d4291dc5d 100755 --- a/increment_version.sh +++ b/increment_version.sh @@ -9,6 +9,8 @@ source "$mydir/merge_helpers.sh" # https://f-droid.org/en/docs/All_About_Descriptions_Graphics_and_Screenshots/ max_changelog_len=500 +should_merge_translations_for_release=0 + if [ "$1" = "preview" ]; then preview=1 shift @@ -30,14 +32,16 @@ pushd "$mydir" > /dev/null do_translation_pull=0 -if [ "$release_type" = "normal" ] && [ "$preview" != 1 ]; then - if git remote get-url weblate > /dev/null; then - echo "Pulling translations..." - translation commit && do_translation_pull=1 || echo "translation tool not found, skipping forced commit" - git fetch weblate - git merge weblate/sc --no-edit - else - echo "WARN: remote weblate not found, not updating translations" +if ((should_merge_translations_for_release)); then + if [ "$release_type" = "normal" ] && [ "$preview" != 1 ]; then + if git remote get-url weblate > /dev/null; then + echo "Pulling translations..." + translation commit && do_translation_pull=1 || echo "translation tool not found, skipping forced commit" + git fetch weblate + git merge weblate/sc --no-edit + else + echo "WARN: remote weblate not found, not updating translations" + fi fi fi