- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser-update-responses][main] Update 11.5.8 mar URLs to point to archive.tpo (tor-browser-build#41233)
by boklm (＠boklm) 10 Sep '24

10 Sep '24

boklm pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: c68ab1ee by Nicolas Vigier at 2024-09-09T18:41:54+02:00 Update 11.5.8 mar URLs to point to archive.tpo (tor-browser-build#41233) We're been keeping 11.5.8 mar files on cdn.torproject.org as a watershed update for a while. We're switching to archive.tpo URLs to be able to remove it from cdn.tpo. - - - - - 30 changed files: - update_pre12.0/release/11.5.7-11.5.8-linux32-ar.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-ca.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-cs.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-da.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-de.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-el.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-en-US.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-es-AR.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-es-ES.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-fa.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-fr.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-ga-IE.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-he.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-hu.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-id.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-is.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-it.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-ja.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-ka.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-ko.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-lt.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-mk.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-ms.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-my.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-nb-NO.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-nl.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-pl.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-pt-BR.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-ro.xml - update_pre12.0/release/11.5.7-11.5.8-linux32-ru.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.15.0esr-13.5-1] 3 commits: Revert "Add CI for Tor Browser"
by Pier Angelo Vendrame (＠pierov) 10 Sep '24

10 Sep '24

Pier Angelo Vendrame pushed to branch tor-browser-115.15.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 5be5f679 by Beatriz Rizental at 2024-09-10T15:27:58+02:00 Revert "Add CI for Tor Browser" This reverts commit da96aaddf555f72ecf3c5c50c7c563f943c78af4. - - - - - 4ec29062 by Beatriz Rizental at 2024-09-10T15:27:58+02:00 Revert "Add CI for Base Browser" This reverts commit 8a16305a6f2ee34e9e7fe7c0ce3f7edf407ebcc6. - - - - - 8eb0e1e5 by Beatriz Rizental at 2024-09-10T15:27:58+02:00 Add CI for Tor Browser - - - - - 3 changed files: - .gitlab-ci.yml - − .gitlab/ci/lint.yml - − .gitlab/ci/scripts/run_linters.py Changes: ===================================== .gitlab-ci.yml ===================================== @@ -1,7 +1,5 @@ stages: - - lint - update-translations include: - - local: '.gitlab/ci/lint.yml' - local: '.gitlab/ci/update-translations.yml' ===================================== .gitlab/ci/lint.yml deleted ===================================== @@ -1,319 +0,0 @@ -variables: - # This needs to be kept in sync with the max Python version accepted by ./mach - PYTHON_VERSION: "3.11.7" - -.base: - stage: lint - interruptible: true - variables: - PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" - cache: - paths: - - node_modules - - .cache/pip - -eslint: - extends: .base - image: cimg/python:$PYTHON_VERSION-node - script: - - .gitlab/ci/scripts/run_linters.py eslint - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - changes: - # List copied from: taskcluster/ci/source-test/mozlint.yml - # - # Files that are likely audited. - - '**/*.js' - - '**/*.jsm' - - '**/*.json' - - '**/*.jsx' - - '**/*.mjs' - - '**/*.sjs' - - '**/*.html' - - '**/*.xhtml' - - '**/*.xml' - - 'tools/lint/eslint.yml' - # Run when eslint policies change. - - '**/.eslintignore' - - '**/*eslintrc*' - # The plugin implementing custom checks. - - 'tools/lint/eslint/eslint-plugin-mozilla/**' - - 'tools/lint/eslint/eslint-plugin-spidermonkey-js/**' - # Run job whenever a new tag is created - # or whenever a commit is merged to a protected branch - - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' - -stylelint: - extends: .base - image: cimg/python:$PYTHON_VERSION-node - script: - - .gitlab/ci/scripts/run_linters.py stylelint - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - changes: - # List copied from: taskcluster/ci/source-test/mozlint.yml - # - # Files that are likely audited. - - '**/*.css' - - 'tools/lint/styleint.yml' - # Run when stylelint policies change. - - '**/.stylelintignore' - - '**/*stylelintrc*' - # Run job whenever a new tag is created - # or whenever a commit is merged to a protected branch - - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' - -py-black: - extends: .base - image: cimg/python:$PYTHON_VERSION - script: - - .gitlab/ci/scripts/run_linters.py black - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - changes: - # List copied from: taskcluster/ci/source-test/mozlint.yml - # - # The list of extensions should match tools/lint/black.yml - - '**/*.py' - - '**/moz.build' - - '**/*.configure' - - '**/*.mozbuild' - - 'pyproject.toml' - - 'tools/lint/black.yml' - # Run job whenever a new tag is created - # or whenever a commit is merged to a protected branch - - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' - -py-ruff: - extends: .base - image: cimg/python:$PYTHON_VERSION - script: - - .gitlab/ci/scripts/run_linters.py ruff - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - changes: - # List copied from: taskcluster/ci/source-test/mozlint.yml - # - - '**/*.py' - - '**/*.configure' - - '**/.ruff.toml' - - 'pyproject.toml' - - 'tools/lint/ruff.yml' - - 'tools/lint/python/ruff.py' - - 'tools/lint/python/ruff_requirements.txt' - # Run job whenever a new tag is created - # or whenever a commit is merged to a protected branch - - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' - -yaml: - extends: .base - image: cimg/python:$PYTHON_VERSION - script: - - .gitlab/ci/scripts/run_linters.py yaml - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - changes: - # List copied from: taskcluster/ci/source-test/mozlint.yml - # - - '**/*.yml' - - '**/*.yaml' - - '**/.ymllint' - # Run job whenever a new tag is created - # or whenever a commit is merged to a protected branch - - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' - -shellcheck: - extends: .base - image: cimg/python:$PYTHON_VERSION - script: - - .gitlab/ci/scripts/run_linters.py shellcheck - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - changes: - # List copied from: taskcluster/ci/source-test/mozlint.yml - # - - '**/*.sh' - - 'tools/lint/shellcheck.yml' - # Run job whenever a new tag is created - # or whenever a commit is merged to a protected branch - - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' - -clang-format: - extends: .base - image: cimg/python:$PYTHON_VERSION - script: - - .gitlab/ci/scripts/run_linters.py clang-format - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - changes: - # List copied from: taskcluster/ci/source-test/mozlint.yml - # - - '**/*.cpp' - - '**/*.c' - - '**/*.cc' - - '**/*.h' - - '**/*.m' - - '**/*.mm' - - 'tools/lint/clang-format.yml' - # Run job whenever a new tag is created - # or whenever a commit is merged to a protected branch - - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' - -rustfmt: - extends: .base - image: cimg/python:$PYTHON_VERSION - script: - - .gitlab/ci/scripts/run_linters.py rustfmt - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - changes: - # List copied from: taskcluster/ci/source-test/mozlint.yml - # - - '**/*.rs' - - 'tools/lint/rustfmt.yml' - # Run job whenever a new tag is created - # or whenever a commit is merged to a protected branch - - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' - -fluent-lint: - extends: .base - image: cimg/python:$PYTHON_VERSION - script: - - .gitlab/ci/scripts/run_linters.py fluent-lint - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - changes: - # List copied from: taskcluster/ci/source-test/mozlint.yml - # - - '**/*.ftl' - - 'tools/lint/fluent-lint.yml' - - 'tools/lint/fluent-lint/exclusions.yml' - # Run job whenever a new tag is created - # or whenever a commit is merged to a protected branch - - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' - -localization: - extends: .base - image: cimg/python:$PYTHON_VERSION - script: - - .gitlab/ci/scripts/run_linters.py l10n - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - changes: - # List copied from: taskcluster/ci/source-test/mozlint.yml - # - - '**/locales/en-US/**' - - '**/l10n.toml' - - 'third_party/python/compare-locales/**' - - 'third_party/python/fluent/**' - - 'tools/lint/l10n.yml' - # Run job whenever a new tag is created - # or whenever a commit is merged to a protected branch - - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' - -mingw-capitalization: - extends: .base - image: cimg/python:$PYTHON_VERSION - script: - - .gitlab/ci/scripts/run_linters.py mingw-capitalization - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - changes: - # List copied from: taskcluster/ci/source-test/mozlint.yml - # - - '**/*.cpp' - - '**/*.cc' - - '**/*.c' - - '**/*.h' - - 'tools/lint/mingw-capitalization.yml' - # Run job whenever a new tag is created - # or whenever a commit is merged to a protected branch - - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' - -mscom-init: - extends: .base - image: cimg/python:$PYTHON_VERSION - script: - - .gitlab/ci/scripts/run_linters.py mscom-init - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - changes: - # List copied from: taskcluster/ci/source-test/mozlint.yml - # - - '**/*.cpp' - - '**/*.cc' - - '**/*.c' - - '**/*.h' - - 'tools/lint/mscom-init.yml' - # Run job whenever a new tag is created - # or whenever a commit is merged to a protected branch - - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' - -file-whitespace: - extends: .base - image: cimg/python:$PYTHON_VERSION - script: - - .gitlab/ci/scripts/run_linters.py file-whitespace - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - changes: - # List copied from: taskcluster/ci/source-test/mozlint.yml - # - - '**/*.c' - - '**/*.cc' - - '**/*.cpp' - - '**/*.css' - - '**/*.dtd' - - '**/*.idl' - - '**/*.ftl' - - '**/*.h' - - '**/*.html' - - '**/*.md' - - '**/*.properties' - - '**/*.py' - - '**/*.rs' - - '**/*.rst' - - '**/*.webidl' - - '**/*.xhtml' - - 'tools/lint/file-whitespace.yml' - # Run job whenever a new tag is created - # or whenever a commit is merged to a protected branch - - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' - -test-manifest: - extends: .base - image: cimg/python:$PYTHON_VERSION - script: - - .gitlab/ci/scripts/run_linters.py test-manifest-alpha test-manifest-disable test-manifest-skip-if - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - changes: - # List copied from: taskcluster/ci/source-test/mozlint.yml - # - - '**/*.ini' - - 'python/mozlint/**' - - 'tools/lint/**' - # Run job whenever a new tag is created - # or whenever a commit is merged to a protected branch - - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' - -trojan-source: - extends: .base - image: cimg/python:$PYTHON_VERSION - script: - - .gitlab/ci/scripts/run_linters.py trojan-source - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - changes: - # List copied from: taskcluster/ci/source-test/mozlint.yml - # - - '**/*.c' - - '**/*.cc' - - '**/*.cpp' - - '**/*.h' - - '**/*.py' - - '**/*.rs' - - 'tools/lint/trojan-source.yml' - # Run job whenever a new tag is created - # or whenever a commit is merged to a protected branch - - if: $CI_COMMIT_TAG || $CI_COMMIT_REF_PROTECTED == 'true' ===================================== .gitlab/ci/scripts/run_linters.py deleted ===================================== @@ -1,110 +0,0 @@ -#!/usr/bin/env python3 - -import argparse -import os -import re -import shlex -import subprocess -import sys - - -def git(command): - result = subprocess.run( - ["git"] + shlex.split(command), check=True, capture_output=True, text=True - ) - return result.stdout.strip() - - -def get_firefox_tag_from_branch_name(branch_name): - """Extracts the Firefox tag associated with a branch name. - - The "firefox tag" is the tag that marks - the end of the Mozilla commits and the start of the Tor Project commits. - - Know issue: If ever there is more than one tag per Firefox ESR version, - this function may return the incorrect reference number. - - Args: - branch_name: The branch name to extract the tag from. - Expected format is tor-browser-91.2.0esr-11.0-1, - where 91.2.0esr is the Firefox version. - - Returns: - The reference specifier of the matching Firefox tag. - An exception wil be raised if anything goes wrong. - """ - - # Extracts the version number from a branch name. - firefox_version = "" - match = re.search(r"(?<=browser-)([^-]+)", branch_name) - if match: - # TODO: Validate that what we got is actually a valid semver string? - firefox_version = match.group(1) - else: - raise ValueError(f"Failed to extract version from branch name '{branch_name}'.") - - tag = f"FIREFOX_{firefox_version.replace('.', '_')}_" - remote_tags = git("ls-remote --tags") - - # Each line looks like: - # 9edd658bfd03a6b4743ecb75fd4a9ad968603715 refs/tags/FIREFOX_91_9_0esr_BUILD1 - pattern = rf"(.*){re.escape(tag)}(.*)$" - match = re.search(pattern, remote_tags, flags=re.MULTILINE) - if match: - return match.group(0).split()[0] - else: - raise ValueError( - f"Failed to find reference specifier for Firefox tag in branch '{branch_name}'." - ) - - -def get_list_of_changed_files(): - """Gets a list of files changed in the working directory. - - This function is meant to be run inside the Gitlab CI environment. - - When running in a default branch, get the list of changed files since the last Firefox tag. - When running for a new MR commit, get a list of changed files in the current MR. - - Returns: - A list of filenames of changed files (excluding deleted files). - An exception wil be raised if anything goes wrong. - """ - - base_reference = "" - - if os.getenv("CI_PIPELINE_SOURCE") == "merge_request_event": - # For merge requests, the base_reference is the common ancestor between the MR and the target branch. - base_reference = os.getenv("CI_MERGE_REQUEST_DIFF_BASE_SHA") - else: - # When not in merge requests, the base reference is the Firefox tag - base_reference = get_firefox_tag_from_branch_name(os.getenv("CI_COMMIT_BRANCH")) - - if not base_reference: - raise RuntimeError("No base reference found. There might be more errors above.") - - # Fetch the tag reference - git(f"fetch origin {base_reference} --depth=1 --filter=blob:none") - # Return the list of changed files - return git(f"diff --diff-filter=d --name-only {base_reference} HEAD").split("\n") - - -if __name__ == "__main__": - parser = argparse.ArgumentParser( - description="Run ./mach linters in CI. Warning: if you run this in your local environment it might mess up your git history." - ) - parser.add_argument( - "linters", metavar="L", type=str, nargs="+", help="A list of linters to run." - ) - args = parser.parse_args() - - command = [ - "./mach", - "lint", - "-v", - *(s for l in args.linters for s in ("-l", l)), - *get_list_of_changed_files(), - ] - result = subprocess.run(command, text=True) - - sys.exit(result.returncode) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/767815… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/767815… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] 2 commits: Bug 41232: Implement single-arch testbuilds on the monorepo.
by Pier Angelo Vendrame (＠pierov) 10 Sep '24

10 Sep '24

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: fe08aea2 by Pier Angelo Vendrame at 2024-09-10T09:54:59+02:00 Bug 41232: Implement single-arch testbuilds on the monorepo. The trick of the fake fat AAR does not work anymore, as the fat AAR is consumed in the same script where it is created. However, running an Android build from a single-arch tree seems not to involve different commands, so we can create a shared script and include it in both the build steps. - - - - - d057d3b5 by Pier Angelo Vendrame at 2024-09-10T09:55:04+02:00 Bug 41234: Add some dependencies needed for Android/release. Building Android as release fails because we do not provide some additional dependencies to our offline builds. - - - - - 9 changed files: - projects/browser/config - projects/geckoview/build - + projects/geckoview/build_ac_fenix - projects/geckoview/build_apk - projects/geckoview/build_common - projects/geckoview/config - projects/geckoview/gradle-dependencies-list.txt - projects/tor-expert-bundle-aar/build - projects/tor-expert-bundle-aar/config Changes: ===================================== projects/browser/config ===================================== @@ -90,7 +90,11 @@ input_files: - project: geckoview name: fenix pkg_type: build_apk - enable: '[% c("var/android") %]' + enable: '[% c("var/android") && !c("var/android_single_arch") %]' + - project: geckoview + name: fenix + pkg_type: build + enable: '[% c("var/android") && c("var/android_single_arch") %]' - project: tor-expert-bundle name: tor-expert-bundle enable: '[% c("var/tor-browser") %]' ===================================== projects/geckoview/build ===================================== @@ -43,29 +43,14 @@ echo "Starting ./mach configure $(date)" echo "Starting ./mach build $(date)" ./mach build --verbose +echo "Build finished, copying the AAR to the to the destination directory $(date)" + [% IF !c("var/android_single_arch") -%] mkdir "$distdir/[% project %]" # We don't want the debug or "exoplayer" .aars, but the .aar that has `omni` in its name. find obj-* -type f -name geckoview*omni*.aar -exec cp {} $distdir/[% project %] \; [% ELSE -%] - # For single-arch builds, we want to fake a fat aar anyway, to avoid having - # arch suffixes in filenames, or having to rename files. - cat >> mozconfig-android-all << 'MOZCONFIG_EOF' -ac_add_options --enable-update-channel=[% c("var/variant") %] -ac_add_options --with-base-browser-version=[% c("var/torbrowser_version") %] -export MOZ_INCLUDE_SOURCE_INFO=1 -export MOZ_SOURCE_REPO="[% c('var/gitlab_project') %]" -export MOZ_SOURCE_CHANGESET=[% c("var/git_commit") %] -MOZCONFIG_EOF - - echo "Starting the creation of the fake fat AAR $(date)" - pushd tools/geckoview - touch android-env.sh - make fataar ARCHS="[% c('arch') %]" - popd - MOZCONFIG=mozconfig-android-all ./mach gradle \ - geckoview:publishWithGeckoBinariesDebugPublicationToMavenLocal \ - exoplayer2:publishDebugPublicationToMavenLocal +[% INCLUDE 'build_ac_fenix' %] [% END -%] echo "Starting to package artifacts $(date)" ===================================== projects/geckoview/build_ac_fenix ===================================== @@ -0,0 +1,56 @@ +[% IF c('var/has_l10n') -%] + echo "Injecting the Firefox's localization to GV $(date)" + supported_locales="[% tmpl(c('var/locales_mobile').join(' ')).replace('-r', '-').replace('in', 'id').replace('iw', 'he') %]" + l10ncentral="$HOME/.mozbuild/l10n-central" + mkdir "$l10ncentral" + for tarball in $rootdir/[% c('input_files_by_name/firefox-l10n') %]/*; do + tar -C "$l10ncentral" -xf "$tarball" + done + + # Do not setup our localization files, as we do not provide any frontend + # through GeckoView. + + # No quotes on purpose, to pass each locale as an additional argument. + ./mach package-multi-locale --locales en-US $supported_locales +[% END -%] + +echo "Building Android Components $(date)" +pushd mobile/android/android-components +gradle $GRADLE_FLAGS assembleGecko -x lint +popd + +# The build might fail with "file exists" otherwise. +rm -rf /var/tmp/dist/android-toolchain/gradle/glean/pythonenv + +echo "Building Fenix $(date)" +pushd mobile/android/fenix + +cp -a $rootdir/[% c('input_files_by_name/tor-expert-bundle-aar') %]/tor-expert-bundle.aar app/ + +# Use the Android Components we have just built +echo autoPublish.android-components.dir=../android-components > local.properties + +[% IF c('var/has_l10n') -%] + tar -C $distdir -xf $rootdir/[% c('input_files_by_name/translation-fenix') %] + # Add our localized strings + supported_locales="[% tmpl(c('var/locales_mobile').join(' ')) %]" + for lang in $supported_locales; do + cp "/var/tmp/dist/translation-fenix/$lang/torbrowser_strings.xml" "app/src/main/res/values-$lang/" + done +[% END -%] + +# Bug 40485: Inject deterministic build date into Glean. +echo 'ext.gleanBuildDate = "0"' >> app/build.gradle + +variant='[% c("var/variant") %]' +version_name="[% c('var/torbrowser_version') %] ([% c('var/geckoview_version') %])" + +gradle $GRADLE_FLAGS -PversionName="$version_name" "assemble$variant" + +echo "Build finished, copying the APK(s) to the destination directory $(date)" + +mkdir $distdir/[% project %] +cp app/build/outputs/apk/fenix/$variant/*.apk $distdir/[% project %] + +popd + ===================================== projects/geckoview/build_apk ===================================== @@ -1,10 +1,7 @@ #!/bin/bash [% INCLUDE 'build_common' %] -tar -C $distdir -xf $rootdir/[% c('input_files_by_name/translation-fenix') %] - -tar -xf [% c('input_files_by_name/glean-wheels') %] -export GLEAN_PYTHON_WHEELS_DIR=$rootdir/glean-wheels +echo "Starting the creation of the fat AAR $(date)" tar -C $builddir -xf [% c('input_files_by_name/geckoview_armv7') %] tar -C $builddir -xf [% c('input_files_by_name/geckoview_aarch64') %] @@ -29,18 +26,6 @@ export MOZ_SOURCE_REPO="[% c('var/gitlab_project') %]" export MOZ_SOURCE_CHANGESET=[% c("var/git_commit") %] MOZCONFIG_EOF -[% IF c("var/has_l10n") -%] - supported_locales="[% tmpl(c('var/locales_mobile').join(' ')).replace('-r', '-').replace('in', 'id').replace('iw', 'he') %]" - l10ncentral="$HOME/.mozbuild/l10n-central" - mkdir "$l10ncentral" - for tarball in $rootdir/[% c('input_files_by_name/firefox-l10n') %]/*; do - tar -C "$l10ncentral" -xf "$tarball" - done - - # Do not setup our localization files, as we do not provide any frontend - # through GeckoView. -[% END -%] - # We still need to specify --tor-browser-version due to bug 34005. ./mach configure \ --with-base-browser-version=[% c("var/torbrowser_version") %] \ @@ -49,43 +34,7 @@ MOZCONFIG_EOF ./mach build --verbose -[% IF c('var/has_l10n') -%] - # No quotes on purpose, to pass each locale as an additional argument. - ./mach package-multi-locale --locales en-US $supported_locales -[% END -%] - -pushd mobile/android/android-components -gradle $GRADLE_FLAGS assembleGecko -x lint -popd - -# The build might fail with "file exists" otherwise. -rm -rf /var/tmp/dist/android-toolchain/gradle/glean/pythonenv - -pushd mobile/android/fenix - -cp -a $rootdir/[% c('input_files_by_name/tor-expert-bundle-aar') %]/tor-expert-bundle.aar app/ - -# Use the Android Components we have just built -echo autoPublish.android-components.dir=../android-components > local.properties - -# Add our localized strings -supported_locales="[% tmpl(c('var/locales_mobile').join(' ')) %]" -for lang in $supported_locales; do - cp "/var/tmp/dist/translation-fenix/$lang/torbrowser_strings.xml" "app/src/main/res/values-$lang/" -done - -# Bug 40485: Inject deterministic build date into Glean. -echo 'ext.gleanBuildDate = "0"' >> app/build.gradle - -variant='[% c("var/variant") %]' -version_name="[% c('var/torbrowser_version') %] ([% c('var/geckoview_version') %])" - -gradle $GRADLE_FLAGS -PversionName="$version_name" "assemble$variant" - -mkdir $distdir/[% project %] -cp app/build/outputs/apk/fenix/$variant/*.apk $distdir/[% project %] - -popd +[% INCLUDE 'build_ac_fenix' %] cd $distdir/ [% c('tar', { ===================================== projects/geckoview/build_common ===================================== @@ -37,6 +37,9 @@ cp -rl $gradle_repo/dl/android/maven2/* $gradle_repo || true cp -rl $gradle_repo/m2/* $gradle_repo || true cp -rl $gradle_repo/maven2/* $gradle_repo || true +tar -xf [% c('input_files_by_name/glean-wheels') %] +export GLEAN_PYTHON_WHEELS_DIR=$rootdir/glean-wheels + tar -xf [% c('input_files_by_name/oss-licenses-plugin') %] cp -rl oss-licenses-plugin/. $gradle_repo ===================================== projects/geckoview/config ===================================== @@ -36,7 +36,7 @@ var: - openjdk-17-jdk-headless # this should be updated when the list of gradle dependencies is changed # see doc/how-to-create-gradle-dependencies-list.txt - gradle_dependencies_version: 14 + gradle_dependencies_version: 15 gradle_version: 8.8 glean_parser: 14.0.1 variant: beta @@ -105,6 +105,7 @@ steps: - name: translation-fenix project: translation pkg_type: fenix + enable: '[% c("var/has_l10n") %]' - URL: '[% pc("glean", "var/glean_wheels_url/" _ c("var/glean_parser"), { error_if_undef => 1 }) %]' name: glean-wheels sha256sum: '[% pc("glean", "var/glean_wheels_sha256sum/" _ c("var/glean_parser"), { error_if_undef => 1 }) %]' @@ -150,5 +151,18 @@ input_files: - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' + - URL: '[% pc("glean", "var/glean_wheels_url/" _ c("var/glean_parser"), { error_if_undef => 1 }) %]' + name: glean-wheels + sha256sum: '[% pc("glean", "var/glean_wheels_sha256sum/" _ c("var/glean_parser"), { error_if_undef => 1 }) %]' - project: oss-licenses-plugin name: oss-licenses-plugin + - name: tor-expert-bundle-aar + project: tor-expert-bundle-aar + enable: '[% c("var/android_single_arch") %]' + - project: firefox-l10n + name: firefox-l10n + enable: '[% c("var/android_single_arch") && c("var/has_l10n") %]' + - name: translation-fenix + project: translation + pkg_type: fenix + enable: '[% c("var/android_single_arch") && c("var/has_l10n") %]' ===================================== projects/geckoview/gradle-dependencies-list.txt ===================================== @@ -2907,3 +2907,25 @@ fd64e97234d4c056018ed5ab1e22932bfe5a31b8d80ab9375b6b7b9dfa7ed031 | https://maven 9f40ab0b8cf4e7cb0f593493c2ed96e7155d0e91eb592407597ecd61e2d5a054 | https://maven.google.com/androidx/compose/runtime/runtime/1.6.7/runtime-1.6… 3018ecf7ef0302f1c2492e4c627ae36b763167779b4595fa89331553f5b0c51a | https://maven.google.com/androidx/compose/material/material-ripple/1.6.7/ma… 4e75469751c9d4c464c7d06af283b9737693c20bc4aaf657630bb294c27bbff1 | https://maven.google.com/androidx/compose/foundation/foundation-layout/1.6.… +74c0e3f8c3df0b1d32ab9d839448c914586d3e8479611e4386fecfa6b3f0a26b | https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp-urlconnection/4.… +a99cf993825e5a2ff12f50973398e7c9fc570055368bdf1026a79efcfb5e6d72 | https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp-urlconnection/4.… +b88186fde75edc3871c5e785c112006dfdd670abba1bb50cdb669fd32291f411 | https://repo1.maven.org/maven2/com/squareup/leakcanary/leakcanary-android-i… +db2f190ebcb2d5d2d5fdb535907df5ab0df0854db49186409ba51c7942441d96 | https://repo1.maven.org/maven2/com/squareup/leakcanary/leakcanary-android-i… +15848fb56db32f4c7cdc72b324003183d52a4884d6bf09be708ac7f587d139b5 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common… +8cd23d889a14095c6ce16840d29b1a6388fa5e115144c1309d4d6d469c1bc351 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common… +67359f609dfc2bf65da1270b23033f856064ec279f058e0a70c715f7c9003031 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-liveda… +d7c9e019cf68779387481877878f6c499d1786b85f2c0480e9264dd5097c51c0 | https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-liveda… +0157de61a2064047896a058080f3fd67ba57ad9a94857b3f7a363660243e3f90 | https://maven.google.com/androidx/annotation/annotation-experimental/1.1.0/… +550a6601e1af47cf99501cc6cc15d1ebe9cef17b51e5dd58b6ab6c23568ef7a9 | https://maven.google.com/androidx/annotation/annotation-experimental/1.1.0/… +9029262bddce116e6d02be499e4afdba21f24c239087b76b3b57d7e98b490a36 | https://maven.google.com/androidx/annotation/annotation/1.2.0/annotation-1.… +62fb6dca2777efe08e7077d6b872d69110619df7fc21c99a6f54066499cc0383 | https://maven.google.com/androidx/annotation/annotation/1.2.0/annotation-1.… +4867fd5279742fba8388821930cb2affe06d81a52814e7e41e70392ea0ef887c | https://maven.google.com/androidx/lifecycle/lifecycle-runtime/2.6.2/lifecyc… +8175255546e2a5f510865f84ace680660954730240b1905d9175b4345beda977 | https://maven.google.com/androidx/lifecycle/lifecycle-runtime/2.6.2/lifecyc… +7bc7dcbab17636ec076f12afe4d02671265c389457b1b366b37a0e8cb91e2da0 | https://maven.google.com/androidx/lifecycle/lifecycle-viewmodel-savedstate/… +7fc854440644cf52c35894d58d946b208e42769e8517d71a5efcba17865432de | https://maven.google.com/androidx/lifecycle/lifecycle-viewmodel-savedstate/… +2256780a3cff4a1e57fbb3d442557c17dc363ab8af105bcaf5261d8e2d5db949 | https://maven.google.com/androidx/lifecycle/lifecycle-livedata-core/2.6.2/l… +1faf8ebf53f28b2f0ae2c2095371ae67d0ca16ac328fce7f163609a43214b5a4 | https://maven.google.com/androidx/lifecycle/lifecycle-livedata-core/2.6.2/l… +e4ff4338999e1c6c9c724719f5d4aa7dd61bf6f545d5256a27a9d375df9f2330 | https://maven.google.com/androidx/lifecycle/lifecycle-viewmodel/2.6.2/lifec… +a9fb0b39a8360beef7bdc8f3953d4d78f3d85304fc80adac3c8eaf530d758050 | https://maven.google.com/androidx/lifecycle/lifecycle-viewmodel/2.6.2/lifec… +f34831b6c71cd844e1d35d1be49d5e79447c5ab856346531b1e8676fda7374b1 | https://maven.google.com/androidx/lifecycle/lifecycle-common/2.6.2/lifecycl… +57304cdac4da289a6ecdd0738e16b1d8858f1ef8e9fabe2d65a963719fd81dba | https://maven.google.com/androidx/lifecycle/lifecycle-common/2.6.2/lifecycl… ===================================== projects/tor-expert-bundle-aar/build ===================================== @@ -7,8 +7,12 @@ mkdir -p /var/tmp/build $distdir mkdir tor-expert-bundle-aar cd tor-expert-bundle-aar -[% FOREACH arch = ['armv7', 'aarch64', 'x86', 'x86_64'] -%] - unzip -o $rootdir/[% c('input_files_by_name/tor-expert-bundle-' _ arch) %]/tor-expert-bundle-[% arch %].aar +[% IF c("var/android_single_arch") -%] + unzip -o $rootdir/[% c('input_files_by_name/tor-expert-bundle') %]/tor-expert-bundle-[% c("arch") %].aar +[% ELSE -%] + [% FOREACH arch = ['armv7', 'aarch64', 'x86', 'x86_64'] -%] + unzip -o $rootdir/[% c('input_files_by_name/tor-expert-bundle-' _ arch) %]/tor-expert-bundle-[% arch %].aar + [% END -%] [% END -%] -jar -cvf $distdir/tor-expert-bundle.aar * \ No newline at end of file +jar -cvf $distdir/tor-expert-bundle.aar * ===================================== projects/tor-expert-bundle-aar/config ===================================== @@ -12,15 +12,22 @@ input_files: name: tor-expert-bundle-armv7 target_replace: '^torbrowser-(?!testbuild).*': 'torbrowser-android-armv7' + enable: '[% !c("var/android_single_arch") %]' - project: tor-expert-bundle name: tor-expert-bundle-aarch64 target_replace: '^torbrowser-(?!testbuild).*': 'torbrowser-android-aarch64' + enable: '[% !c("var/android_single_arch") %]' - project: tor-expert-bundle name: tor-expert-bundle-x86 target_replace: '^torbrowser-(?!testbuild).*': 'torbrowser-android-x86' + enable: '[% !c("var/android_single_arch") %]' - project: tor-expert-bundle name: tor-expert-bundle-x86_64 target_replace: '^torbrowser-(?!testbuild).*': 'torbrowser-android-x86_64' + enable: '[% !c("var/android_single_arch") %]' + - project: tor-expert-bundle + name: tor-expert-bundle + enable: '[% c("var/android_single_arch") %]' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.2.0esr-14.0-1] fixup! Firefox preference overrides.
by morgan (＠morgan) 10 Sep '24

10 Sep '24

morgan pushed to branch mullvad-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: fdc0d894 by Morgan at 2024-09-09T19:01:29+00:00 fixup! Firefox preference overrides. Bug 42255: lock pdfjs.disabled to false in stable - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -433,6 +433,10 @@ pref("network.http.referer.XOriginTrimmingPolicy", 2); // Bug 17228: Force trim pref("network.http.windows-sso.enabled", false, locked); // tor-browser#40424 pref("pdfjs.enableScripting", false); +#if MOZ_UPDATE_CHANNEL == release +// tor-browser#42255: pdfjs.disabled used to be part of RFP until Bug 1838415; lock pref to false in stable +pref("pdfjs.disabled", false, locked); +#endif // Bug 40057: Ensure system colors are not used for CSS4 colors pref("browser.display.use_system_colors", false); // Enforce non-native widget theme (true by default, defense in depth). View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/fdc… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/fdc… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.2.0esr-14.0-1] fixup! Firefox preference overrides.
by morgan (＠morgan) 10 Sep '24

10 Sep '24

morgan pushed to branch base-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 69a7c008 by Morgan at 2024-09-09T19:01:06+00:00 fixup! Firefox preference overrides. Bug 42255: lock pdfjs.disabled to false in stable - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -433,6 +433,10 @@ pref("network.http.referer.XOriginTrimmingPolicy", 2); // Bug 17228: Force trim pref("network.http.windows-sso.enabled", false, locked); // tor-browser#40424 pref("pdfjs.enableScripting", false); +#if MOZ_UPDATE_CHANNEL == release +// tor-browser#42255: pdfjs.disabled used to be part of RFP until Bug 1838415; lock pref to false in stable +pref("pdfjs.disabled", false, locked); +#endif // Bug 40057: Ensure system colors are not used for CSS4 colors pref("browser.display.use_system_colors", false); // Enforce non-native widget theme (true by default, defense in depth). View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/69a7c00… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/69a7c00… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.2.0esr-14.0-1] fixup! Firefox preference overrides.
by morgan (＠morgan) 10 Sep '24

10 Sep '24

morgan pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: a36c4f1c by Morgan at 2024-09-09T18:59:45+00:00 fixup! Firefox preference overrides. Bug 42255: lock pdfjs.disabled to false in stable - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -433,6 +433,10 @@ pref("network.http.referer.XOriginTrimmingPolicy", 2); // Bug 17228: Force trim pref("network.http.windows-sso.enabled", false, locked); // tor-browser#40424 pref("pdfjs.enableScripting", false); +#if MOZ_UPDATE_CHANNEL == release +// tor-browser#42255: pdfjs.disabled used to be part of RFP until Bug 1838415; lock pref to false in stable +pref("pdfjs.disabled", false, locked); +#endif // Bug 40057: Ensure system colors are not used for CSS4 colors pref("browser.display.use_system_colors", false); // Enforce non-native widget theme (true by default, defense in depth). View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a36c4f1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a36c4f1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.2.0esr-14.0-1] Bug 43117: Hide "Always underline links" from settings.
by morgan (＠morgan) 10 Sep '24

10 Sep '24

morgan pushed to branch mullvad-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 14a0d11a by Henry Wilkes at 2024-09-09T18:58:09+00:00 Bug 43117: Hide "Always underline links" from settings. - - - - - 1 changed file: - browser/components/preferences/main.inc.xhtml Changes: ===================================== browser/components/preferences/main.inc.xhtml ===================================== @@ -752,7 +752,8 @@ #endif <checkbox id="alwaysUnderlineLinks" data-l10n-id="browsing-always-underline-links" - preference="layout.css.always_underline_links"/> + preference="layout.css.always_underline_links" + hidden="true"/> <checkbox id="searchStartTyping" data-l10n-id="browsing-search-on-start-typing" preference="accessibility.typeaheadfind"/> View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/14a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/14a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.2.0esr-14.0-1] Bug 43117: Hide "Always underline links" from settings.
by morgan (＠morgan) 10 Sep '24

10 Sep '24

morgan pushed to branch base-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 588c9ed9 by Henry Wilkes at 2024-09-09T18:57:10+00:00 Bug 43117: Hide "Always underline links" from settings. - - - - - 1 changed file: - browser/components/preferences/main.inc.xhtml Changes: ===================================== browser/components/preferences/main.inc.xhtml ===================================== @@ -752,7 +752,8 @@ #endif <checkbox id="alwaysUnderlineLinks" data-l10n-id="browsing-always-underline-links" - preference="layout.css.always_underline_links"/> + preference="layout.css.always_underline_links" + hidden="true"/> <checkbox id="searchStartTyping" data-l10n-id="browsing-search-on-start-typing" preference="accessibility.typeaheadfind"/> View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/588c9ed… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/588c9ed… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.2.0esr-14.0-1] Bug 43117: Hide "Always underline links" from settings.
by morgan (＠morgan) 10 Sep '24

10 Sep '24

morgan pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 655cdbf1 by Henry Wilkes at 2024-09-09T17:09:44+01:00 Bug 43117: Hide "Always underline links" from settings. - - - - - 1 changed file: - browser/components/preferences/main.inc.xhtml Changes: ===================================== browser/components/preferences/main.inc.xhtml ===================================== @@ -752,7 +752,8 @@ #endif <checkbox id="alwaysUnderlineLinks" data-l10n-id="browsing-always-underline-links" - preference="layout.css.always_underline_links"/> + preference="layout.css.always_underline_links" + hidden="true"/> <checkbox id="searchStartTyping" data-l10n-id="browsing-search-on-start-typing" preference="accessibility.typeaheadfind"/> View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/655cdbf… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/655cdbf… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] MB 334: Fix .desktop file for opening external links
by morgan (＠morgan) 10 Sep '24

10 Sep '24

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 396f4ad6 by Nicolas Vigier at 2024-09-09T16:18:27+02:00 MB 334: Fix .desktop file for opening external links The `Exec` entry from the .desktop file included in the rpm and deb packages was missing the `%u` parameter. - - - - - 1 changed file: - projects/linux-packages/browser.desktop.in Changes: ===================================== projects/linux-packages/browser.desktop.in ===================================== @@ -5,7 +5,7 @@ Name=[% c("var/Project_Name") %] GenericName=Web Browser Comment=[% c("var/system_pkg/pkg_description") %] Categories=Network;WebBrowser; -Exec=/[% c("var/system_pkg/install_path") %]/start-[% c("var/project-name") %] --detach +Exec=/[% c("var/system_pkg/install_path") %]/start-[% c("var/project-name") %] --detach %u Icon=[% c("var/system_pkg/pkg_name") %] StartupWMClass=[% c("var/display_name") %] [% IF ! c("var/tor-browser") -%] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/3… You're receiving this email because of your account on gitlab.torproject.org.

1 0