brizental pushed to branch mullvad-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Mullvad Browser
Commits:
-
081b9f68
by Beatriz Rizental at 2025-09-09T13:10:41+02:00
5 changed files:
- .gitlab-ci.yml
- .gitlab/ci/jobs/lint/helpers.py → .gitlab/ci/jobs/helpers.py
- .gitlab/ci/jobs/lint/lint.yml
- + .gitlab/ci/jobs/test/python-test.yml
- .gitlab/ci/jobs/update-translations.yml
Changes:
| 1 | 1 | stages:
|
| 2 | 2 | - lint
|
| 3 | + - test
|
|
| 3 | 4 | - update-translations
|
| 4 | 5 | |
| 5 | 6 | variables:
|
| ... | ... | @@ -9,4 +10,5 @@ variables: |
| 9 | 10 | include:
|
| 10 | 11 | - local: '.gitlab/ci/mixins.yml'
|
| 11 | 12 | - local: '.gitlab/ci/jobs/lint/lint.yml'
|
| 13 | + - local: '.gitlab/ci/jobs/test/python-test.yml'
|
|
| 12 | 14 | - local: '.gitlab/ci/jobs/update-translations.yml' |
| ... | ... | @@ -112,7 +112,7 @@ if __name__ == "__main__": |
| 112 | 112 | parser.add_argument(
|
| 113 | 113 | "--get-changed-files",
|
| 114 | 114 | help="Get list of changed files."
|
| 115 | - "When running from a merge request get sthe list of changed files since the merge-base of the current branch."
|
|
| 115 | + "When running from a merge request gets the list of changed files since the merge-base of the current branch."
|
|
| 116 | 116 | "When running from a protected branch i.e. any branch that starts with <something>-browser-, gets the list of files changed since the FIREFOX_ tag.",
|
| 117 | 117 | action="store_true",
|
| 118 | 118 | )
|
| ... | ... | @@ -18,7 +18,7 @@ lint-all: |
| 18 | 18 | - firefox
|
| 19 | 19 | script:
|
| 20 | 20 | - ./mach configure --with-base-browser-version=0.0.0
|
| 21 | - - .gitlab/ci/jobs/lint/helpers.py --get-changed-files | xargs -0 --no-run-if-empty ./mach lint -v
|
|
| 21 | + - .gitlab/ci/jobs/helpers.py --get-changed-files | xargs -0 --no-run-if-empty ./mach lint -v
|
|
| 22 | 22 | rules:
|
| 23 | 23 | - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
|
| 24 | 24 | # Run job whenever a commit is merged to a protected branch
|
| 1 | +python-test:
|
|
| 2 | + extends: .with-local-repo-bash
|
|
| 3 | + stage: test
|
|
| 4 | + image: $IMAGE_PATH
|
|
| 5 | + interruptible: true
|
|
| 6 | + variables:
|
|
| 7 | + MOZBUILD_STATE_PATH: "/var/tmp/mozbuild"
|
|
| 8 | + cache:
|
|
| 9 | + paths:
|
|
| 10 | + - node_modules
|
|
| 11 | + # Store the cache regardless on job outcome
|
|
| 12 | + when: 'always'
|
|
| 13 | + # Share the cache throughout all pipelines running for a given branch
|
|
| 14 | + key: $CI_COMMIT_REF_SLUG
|
|
| 15 | + tags:
|
|
| 16 | + # Run these jobs in the browser dedicated runners.
|
|
| 17 | + - firefox
|
|
| 18 | + script:
|
|
| 19 | + - ./mach configure --with-base-browser-version=0.0.0
|
|
| 20 | + - .gitlab/ci/jobs/helpers.py --get-changed-files | xargs -0 --no-run-if-empty ./mach python-test -v
|
|
| 21 | + rules:
|
|
| 22 | + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' || ($CI_COMMIT_BRANCH && $CI_COMMIT_REF_PROTECTED == 'true' && $CI_PIPELINE_SOURCE == 'push')
|
|
| 23 | + changes:
|
|
| 24 | + - "**/test_*.py" |
| ... | ... | @@ -81,7 +81,7 @@ combine-en-US-translations: |
| 81 | 81 | # push-en-US-translations job.
|
| 82 | 82 | - echo 'COMBINE_TRANSLATIONS_JOB_ID='"$CI_JOB_ID" >job_id.env
|
| 83 | 83 | - pip install compare_locales
|
| 84 | - - python ./tools/base-browser/l10n/combine-translation-versions.py "$CI_COMMIT_BRANCH" "$TRANSLATION_FILES" "$COMBINED_FILES_JSON"
|
|
| 84 | + - python ./tools/base_browser/l10n/combine-translation-versions.py "$CI_COMMIT_BRANCH" "$TRANSLATION_FILES" "$COMBINED_FILES_JSON"
|
|
| 85 | 85 | |
| 86 | 86 | push-en-US-translations:
|
| 87 | 87 | extends: .update-translation-base
|