Skip to content

Bug 43843: Fix artifact generation for macos and windows

Merge Info

Issues

Resolves

Merging

Target Branches

  • tor-browser - !fixups to tor-browser-specific commits, new features, security backports
  • base-browser and mullvad-browser - !fixups to base-browser-specific commits, new features to be shared with mullvad-browser, and security backports
    • ⚠️ IMPORTANT: Please list the base-browser-specific commits which need to be cherry-picked to the base-browser and mullvad-browser branches here

Backporting

Timeline

  • No Backport (preferred): patchset for the next major stable
  • Immediate: patchset needed as soon as possible (fixes CVEs, 0-days, etc)
  • 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

Upstream

  • Patchset is a candidate for uplift to Firefox (partially)
  • Patchset is a backport from Firefox
    • Bugzilla link:
    • Upstream commit:

Review

Change Description

There are three changes here:

  1. We make it possible to modify the paths to some MacOS installer files through environment variables. We do not keep these files in the same places as upstream. See: tor-browser-build!1226 (diffs)
  2. We disable including an installer folder in the package. That folder is not used by us and not present, which makes the packaging system crash when trying to copy it.
  3. We grab hfsplus and libdmg tools from the env before attempting bootstrap. This is an upstream bug.

How Tested

I have create the packages with tor-browser-build + this branch and tested its possible to create artifact builds from the resulting packages.

Merge request reports

Loading