Pier Angelo Vendrame pushed to branch tor-browser-128.6.0esr-14.5-1 at The Tor
Project / Applications / Tor Browser
Commits:
4fd00231 by Henry Wilkes at 2025-01-22T11:06:59+00:00
fixup! Add CI for Tor Browser
MB 324: Revert tor-browser changes that add update-translations CI.
- - - - -
f467154f by Henry Wilkes at 2025-01-22T11:06:59+00:00
Revert "TB 42305: Add script to combine translation files across versions."
This reverts commit 3247633d3f6bf60be7feaf2e3515d9b7c2b1dad0.
- - - - -
675287aa by Henry Wilkes at 2025-01-22T11:06:59+00:00
fixup! Add CI for Base Browser
MB 324: Move update-translations CI to base-browser.
- - - - -
4c57d159 by Henry Wilkes at 2025-01-22T11:06:59+00:00
BB 42305: Add script to combine translation files across versions.
- - - - -
e0847a5c by Henry Wilkes at 2025-01-22T11:06:59+00:00
fixup! Add CI for Tor Browser
MB 324: Re-introduce tor-browser changes to update-translations
- - - - -
10 changed files:
- .gitlab/ci/jobs/update-translations.yml
- tools/torbrowser/l10n/combine-translation-versions.py →
tools/base-browser/l10n/combine-translation-versions.py
- tools/torbrowser/l10n/combine/__init__.py →
tools/base-browser/l10n/combine/__init__.py
- tools/torbrowser/l10n/combine/combine.py →
tools/base-browser/l10n/combine/combine.py
- tools/torbrowser/l10n/combine/tests/README →
tools/base-browser/l10n/combine/tests/README
- tools/torbrowser/l10n/combine/tests/__init__.py →
tools/base-browser/l10n/combine/tests/__init__.py
- tools/torbrowser/l10n/combine/tests/test_android.py →
tools/base-browser/l10n/combine/tests/test_android.py
- tools/torbrowser/l10n/combine/tests/test_dtd.py →
tools/base-browser/l10n/combine/tests/test_dtd.py
- tools/torbrowser/l10n/combine/tests/test_fluent.py →
tools/base-browser/l10n/combine/tests/test_fluent.py
- tools/torbrowser/l10n/combine/tests/test_properties.py →
tools/base-browser/l10n/combine/tests/test_properties.py
Changes:
=====================================
.gitlab/ci/jobs/update-translations.yml
=====================================
@@ -1,7 +1,7 @@
.update-translation-base:
stage: update-translations
rules:
- - if: ($CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE ==
"push")
+ - if: ($TRANSLATION_FILES != "" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
&& $CI_PIPELINE_SOURCE == "push")
changes:
- "**/*.ftl"
- "**/*.properties"
@@ -10,17 +10,9 @@
- "**/update-translations.yml"
- "**/l10n/combine/combine.py"
- "**/l10n/combine-translation-versions.py"
- - if: $FORCE_UPDATE_TRANSLATIONS == "true"
+ - if: ($TRANSLATION_FILES != "" && $FORCE_UPDATE_TRANSLATIONS == "true")
variables:
- TOR_BROWSER_COMBINED_FILES_JSON: "combined-translation-files.json"
-
-
-combine-en-US-translations:
- extends: .update-translation-base
- needs: []
- image: python
- variables:
- PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
+ COMBINED_FILES_JSON: "combined-translation-files.json"
TRANSLATION_FILES: '[
{
"name": "brand.ftl",
@@ -49,13 +41,21 @@ combine-en-US-translations:
}
]'
TRANSLATION_INCLUDE_LEGACY: "true"
+
+
+combine-en-US-translations:
+ extends: .update-translation-base
+ needs: []
+ image: python
+ variables:
+ PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
cache:
paths:
- .cache/pip
# Artifact is for translation project job
artifacts:
paths:
- - "$TOR_BROWSER_COMBINED_FILES_JSON"
+ - "$COMBINED_FILES_JSON"
expire_in: "60 min"
reports:
dotenv: job_id.env
@@ -66,14 +66,14 @@ combine-en-US-translations:
# push-en-US-translations job.
- echo 'COMBINE_TRANSLATIONS_JOB_ID='"$CI_JOB_ID" >job_id.env
- pip install compare_locales
- - python ./tools/torbrowser/l10n/combine-translation-versions.py
"$CI_COMMIT_BRANCH" "$TRANSLATION_FILES" "$TOR_BROWSER_COMBINED_FILES_JSON"
+ - python ./tools/base-browser/l10n/combine-translation-versions.py
"$CI_COMMIT_BRANCH" "$TRANSLATION_FILES" "$COMBINED_FILES_JSON"
push-en-US-translations:
extends: .update-translation-base
needs:
- job: combine-en-US-translations
variables:
- TOR_BROWSER_COMBINED_FILES_JSON_URL:
"${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/jobs/${COMBINE_TRANSLATIONS_JOB_ID}/artifacts/${TOR_BROWSER_COMBINED_FILES_JSON}"
+ COMBINED_FILES_JSON_URL:
"${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/jobs/${COMBINE_TRANSLATIONS_JOB_ID}/artifacts/${COMBINED_FILES_JSON}"
trigger:
strategy: depend
project: tor-browser-translation-bot/translation
=====================================
tools/torbrowser/l10n/combine-translation-versions.py →
tools/base-browser/l10n/combine-translation-versions.py
=====================================
=====================================
tools/torbrowser/l10n/combine/__init__.py →
tools/base-browser/l10n/combine/__init__.py
=====================================
=====================================
tools/torbrowser/l10n/combine/combine.py →
tools/base-browser/l10n/combine/combine.py
=====================================
=====================================
tools/torbrowser/l10n/combine/tests/README →
tools/base-browser/l10n/combine/tests/README
=====================================
=====================================
tools/torbrowser/l10n/combine/tests/__init__.py →
tools/base-browser/l10n/combine/tests/__init__.py
=====================================
=====================================
tools/torbrowser/l10n/combine/tests/test_android.py →
tools/base-browser/l10n/combine/tests/test_android.py
=====================================
=====================================
tools/torbrowser/l10n/combine/tests/test_dtd.py →
tools/base-browser/l10n/combine/tests/test_dtd.py
=====================================
=====================================
tools/torbrowser/l10n/combine/tests/test_fluent.py →
tools/base-browser/l10n/combine/tests/test_fluent.py
=====================================
=====================================
tools/torbrowser/l10n/combine/tests/test_properties.py →
tools/base-browser/l10n/combine/tests/test_properties.py
=====================================
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ecdccd3f2838cc518757b201267080a8db5a731e...e0847a5ce27803e55efea4e69595068d9981d1a1
--
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ecdccd3f2838cc518757b201267080a8db5a731e...e0847a5ce27803e55efea4e69595068d9981d1a1
You're receiving this email because of your account on gitlab.torproject.org.
_______________________________________________
tbb-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
