From d09fe4e12a97fbb940b706d21a42efe784f62741 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Thu, 24 Oct 2024 14:30:28 +0200 Subject: [PATCH] sync latest stable branch with x.y or with x.yz version number Signed-off-by: Matthieu Gallien --- translations-desktop/handleDesktopTranslations.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations-desktop/handleDesktopTranslations.sh b/translations-desktop/handleDesktopTranslations.sh index 50c89173..779839fa 100755 --- a/translations-desktop/handleDesktopTranslations.sh +++ b/translations-desktop/handleDesktopTranslations.sh @@ -15,7 +15,7 @@ cd desktop # Generate source translation files for master and stable-x.y branches mkdir /branches -versions=$(git branch -r | grep "origin\/stable\-[0-9]\.[0-9]$" | cut -f2 -d"/" | sort -r | head -n 1)" master" +versions=$(git branch -r | grep "origin\/stable\-[0-9]\.[0-9]$" | cut -f2 -d"/" | sort -r | head -n 1)" " $(git branch -r | grep "origin\/stable\-[0-9]\.[0-9][0-9]$" | cut -f2 -d"/" | sort -r | head -n 1) " master" # Allow to manually limit translations to specified backport branches within the repo if [[ -f '.tx/backport' ]]; then