Skip to content

Bug 41535: Use trixie for Windows and macOS containers.

Pier Angelo Vendramerequested to merge
pierov/tor-browser-build:41535-trixie into main

Merge Info

Issues

Resolves

  • #41535
  • tor-browser#xxxxx
  • mullvad-browser#xxxxx

Related

  • tor-browser-build#xxxxx
  • tor-browser#xxxxx
  • mullvad-browser#xxxxx

Merging

Target Branches

  • main: esr140-15.0
  • maint-14.5: esr128-14.5
  • maint-13.5: esr115-13.5

Backporting

Timeline

  • No Backport (preferred): patchset for the next major stable
  • Immediate: patchset needed as soon as possible
  • Next Minor Stable Release: patchset that needs to be verified in nightly before backport
  • Eventually: patchset that needs to be verified in alpha before backport

(Optional) Justification

  • Emergency security update: patchset fixes CVEs, 0-days, etc
  • Censorship event: patchset enables censorship circumvention
  • Critical bug-fix: patchset fixes a bug in core-functionality
  • Consistency: patchset which would make development easier if it were in both the alpha and release branches; developer tools, build system changes, etc
  • Sponsor required: patchset required for sponsor
  • Other: please explain

Issue Tracking

Uplifting

  • Patchset is a candidate for uplift to upstream projects (e.g. mingw, clang, etc)

Review

Request Reviewer

  • Request review from an applications developer depending on modified system:
    • NOTE: if the MR modifies multiple areas, please /request_review all the relevant reviewers
    • accessibility : henry
    • android : clairehurst, dan
    • build system : boklm
    • extensions : ma1
    • firefox internals (XUL/JS/XPCOM) : jwilde, ma1
    • fonts : pierov
    • frontend (implementation) : henry
    • frontend (review) : donuts, morgan
    • localization : henry, pierov
    • macOS : clairehurst, dan
    • nightly builds : boklm
    • rebases/release-prep : boklm, dan, ma1, morgan, pierov
    • security : jwilde, ma1
    • signing : boklm, morgan
    • updater : pierov
    • windows : jwilde, morgan
    • misc/other : morgan, pierov

Change Description

Since Debian trixie has become stable, we could switch to it our containers.

How Tested

I've tried, and managed to build successfully for Windows (both x86_64 and i686) and macOS (both x86_64 and aarch64).

I had to give up for Android, because GeckoView targets Java 8, which can be targeted from Java 17 (the version we use currently) but not from Java 21, which is the oldest JDK available on trixie.

The Python version shipped by trixie created some problems, which required to drop python3-distutils (I removed also python3-distutils-extra, even though it's still available) and to update Ninja.

Updating Ninja sounds like a good idea anyway, since Mozilla is using 1.12.1, and if we wanted, we could take the latest available (1.13.1).

I built also Android (all platforms) and Linux x86_64 even though we're not updating them to check that these changes don't introduce further problems.

I didn't test for reproducibility problems yet because I'd like to know whether we're merging this first.

If we're attempting to do it already for 15.0a2 I can do a build locally on my machine, otherwise I'll wait for when we think we're ready (as it's very hot already even without my computer building stuff 😅).

Merge request reports