[tor-commits] [Git][tpo/applications/tor-browser][tor-browser-128.4.0esr-14.5-1] 2 commits: fixup! Bug 42305: Add script to combine translation files across versions.

[Pier Angelo Vendrame (@pierov)]

Pier Angelo Vendrame pushed to branch tor-browser-128.4.0esr-14.5-1 at The Tor Project / Applications / Tor Browser


Commits:
7b61c406 by Henry Wilkes at 2024-10-31T10:32:12+00:00
fixup! Bug 42305: Add script to combine translation files across versions.

Bug 43272: Fix git fetch in translation CI script.

- - - - -
3f690c6b by Henry Wilkes at 2024-10-31T10:47:28+00:00
fixup! Add CI for Tor Browser

Bug 43272: Run translation CI whenever CI script changes.

- - - - -


2 changed files:

- .gitlab/ci/update-translations.yml
- tools/torbrowser/l10n/combine-translation-versions.py


Changes:

=====================================
.gitlab/ci/update-translations.yml
=====================================
@@ -7,6 +7,9 @@
         - "**/*.properties"
         - "**/*.dtd"
         - "**/*strings.xml"
+        - "**/update-translations.yml"
+        - "**/l10n/combine/combine.py"
+        - "**/l10n/combine-translation-versions.py"
     - if: $FORCE_UPDATE_TRANSLATIONS == "true"
   variables:
     TOR_BROWSER_COMBINED_FILES_JSON: "combined-translation-files.json"


=====================================
tools/torbrowser/l10n/combine-translation-versions.py
=====================================
@@ -145,7 +145,7 @@ class BrowserBranch:
                 # Minimal fetch of non-HEAD branch to get the file paths.
                 # Individual file blobs will be downloaded as needed.
                 git_run(
-                    ["fetch", "--depth=1", "--filter=blob:none", "origin", self._ref]
+                    ["fetch", "--depth=1", "--filter=blob:none", "origin", self.name]
                 )
             self._file_paths = git_lines(
                 ["ls-tree", "-r", "--format=%(path)", self._ref]
@@ -178,7 +178,7 @@ def get_stable_branch(
     # Moreover, we *assume* that the branch with the most recent ESR version
     # with such a tag will be used in the *next* stable build in
     # tor-browser-build.
-    tag_glob = f"{compare_version.prefix}-*esr-*-*-build1"
+    tag_glob = f"{compare_version.prefix}-*-build1"
 
     # To speed up, only fetch the tags without blobs.
     git_run(
@@ -188,10 +188,15 @@ def get_stable_branch(
     legacy_branches = []
     stable_annotation_regex = re.compile(r"\bstable\b")
     legacy_annotation_regex = re.compile(r"\blegacy\b")
+    tag_pattern = re.compile(
+        rf"^{re.escape(compare_version.prefix)}-[^-]+esr-[^-]+-[^-]+-build1$"
+    )
 
     for build_tag, annotation in (
         line.split(" ", 1) for line in git_lines(["tag", "-n1", "--list", tag_glob])
     ):
+        if not tag_pattern.match(build_tag):
+            continue
         is_stable = bool(stable_annotation_regex.search(annotation))
         is_legacy = bool(legacy_annotation_regex.search(annotation))
         if not is_stable and not is_legacy:



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8dbd8dd6ba2df8cb6cce668d8e00c2e20564b3cd...3f690c6b5a2cd76227ff7f71ec708e1f6cfd52cb

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8dbd8dd6ba2df8cb6cce668d8e00c2e20564b3cd...3f690c6b5a2cd76227ff7f71ec708e1f6cfd52cb
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20241031/ee897898/attachment-0001.htm>