From c3f366ce9e6b133712ef393b34d13990090823fd Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 23 Aug 2022 11:48:14 +0200
Subject: [PATCH] CI: check translations against detached branches
To avoid git complaining about duplicate worktrees, detach
the temporary trees. To avoid python modules translations
changing order (depending on how find traverses the tree),
sort the filenames before extraction.
---
ci/txcheck.sh | 2 +-
ci/txpush.sh | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ci/txcheck.sh b/ci/txcheck.sh
index cedae6682b..78b7f00b18 100755
--- a/ci/txcheck.sh
+++ b/ci/txcheck.sh
@@ -120,7 +120,7 @@ tx_sum()
WORKTREE_NAME="$1"
WORKTREE_TAG="$2"
- git worktree add $WORKTREE_NAME $WORKTREE_TAG > /dev/null 2>&1 || { echo "! Could not create worktree." ; exit 1 ; }
+ git worktree add -d $WORKTREE_NAME $WORKTREE_TAG > /dev/null 2>&1 || { echo "! Could not create worktree." ; exit 1 ; }
( cd $WORKTREE_NAME && sh "$CURDIR"/ci/txpush.sh --no-tx ) > /dev/null 2>&1 || { echo "! Could not re-create translations." ; exit 1 ; }
# Remove linenumbers from .ts (XML) and .pot
diff --git a/ci/txpush.sh b/ci/txpush.sh
index ac806a2fa4..1a0a7249b6 100755
--- a/ci/txpush.sh
+++ b/ci/txpush.sh
@@ -124,8 +124,8 @@ tx push --source --no-interactive -r calamares.fdo
PYGETTEXT="xgettext --keyword=_n:1,2 -L python"
SHARED_PYTHON=""
-for MODULE_DIR in $(find src/modules -maxdepth 1 -mindepth 1 -type d) ; do
- FILES=$(find "$MODULE_DIR" -name "*.py" -a -type f)
+for MODULE_DIR in $(find src/modules -maxdepth 1 -mindepth 1 -type d | sort) ; do
+ FILES=$(find "$MODULE_DIR" -name "*.py" -a -type f | sort)
if test -n "$FILES" ; then
MODULE_NAME=$(basename ${MODULE_DIR})
if [ -d ${MODULE_DIR}/lang ]; then
--
GitLab