morgan pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits: 8a1e1632 by Morgan at 2024-08-15T22:24:47+00:00 Bug 41213: Update the update_manual.py script to notify when no changes needed
- - - - - dd0d076d by Morgan at 2024-08-15T22:24:47+00:00 Bug 41214: Update geckoview/config to be more like firefox/config
- - - - - 55f64b52 by Morgan at 2024-08-15T22:24:47+00:00 Bug 41217: Update realprep.py script to handle Firefox 128-based Tor Browser Android
- - - - - da98860d by Morgan at 2024-08-16T00:08:11+00:00 Update release-prep template for Tor Browser Alpha
- - - - - 6756e42a by Morgan at 2024-08-16T00:09:27+00:00 Bug 41186,41187: Prepare Tor+Mullvad Browser 14.0a2
- - - - -
11 changed files:
- .gitlab/issue_templates/Release Prep - Tor Browser Alpha.md - projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt - projects/browser/config - projects/firefox/config - projects/geckoview/config - projects/go/config - projects/translation/config - rbm.conf - tools/relprep.py - tools/update_manual.py
Changes:
===================================== .gitlab/issue_templates/Release Prep - Tor Browser Alpha.md ===================================== @@ -39,7 +39,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch - [ ] `var/torbrowser_version` : update to next version - [ ] `var/torbrowser_build` : update to `$(TOR_BROWSER_BUILD_N)` - [ ] `var/browser_release_date` : update to build date. For the build to be reproducible, the date should be in the past when building. - - [ ] ***(Desktop Only)***`var/torbrowser_incremental_from` : update to previous Desktop version + - [ ] ***(Desktop Only)*** `var/torbrowser_incremental_from` : update to previous Desktop version - **NOTE**: We try to build incrementals for the previous 3 desktop versions except in the case of a watershed update - **IMPORTANT**: Really *actually* make sure this is the previous Desktop version or else the `make torbrowser-incrementals-*` step will fail - [ ] Update Desktop-specific build configs @@ -49,16 +49,10 @@ Tor Browser Alpha (and Nightly) are on the `main` branch - [ ] Update Android-specific build configs - [ ] Update `projects/geckoview/config` - [ ] `browser_build` : update to match `tor-browser` tag - - [ ] ***(Optional)*** `var/geckoview_version` : update to latest `$(ESR_VERSION)` if rebased - - [ ] ***(Optional)*** Update `projects/tor-android-service/config` - - [ ] `git_hash` : update with `HEAD` commit of project's `main` branch + - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased - [ ] ***(Optional)*** Update `projects/application-services/config`: **NOTE** we don't currently have any of our own patches for this project - [ ] `git_hash` : update to appropriate git commit associated with `$(ESR_VERSION)` - - [ ] ***(Optional)*** Update `projects/firefox-android/config`: - - [ ] `fenix_version` : update to match alpha `firefox-android` build tag - - [ ] `browser_branch` : update to match alpha `firefox-android` build tag - - [ ] `browser_build` : update to match alpha `firefox-android` build tag - [ ] Update `projects/translation/config`: - [ ] run `make list_translation_updates-alpha` to get updated hashes - [ ] `steps/base-browser/git_hash` : update with `HEAD` commit of project's `base-browser` branch
===================================== projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt ===================================== @@ -1,3 +1,64 @@ +Mullvad Browser 14.0a2 - August 16 2024 + * All Platforms + * Updated Firefox to 128.1.0esr + * Updated NoScript to 11.4.34 + * Updated uBlock Origin to 1.59.0 + * Bug 326: Rebase Mullvad Browser Alpha onto 128.1.0esr [mullvad-browser] + * Bug 42596: Several console errors: Console.maxLogLevelPref used with a non-existing pref: [tor-browser] + * Bug 42641: Move from panel-footer class to moz-button-group [tor-browser] + * Bug 42644: toolbar rules in panelUI-shared.css are unneccessary [tor-browser] + * Bug 42667: Add description-deemphasized class to our additions to about:preferences [tor-browser] + * Bug 42679: Use a more robust approach to hide the "tracking protection" urlbar button [tor-browser] + * Bug 42699: Drop level="top" attribute from panels [tor-browser] + * Bug 42704: Drop the badged="true" attribute from security level button [tor-browser] + * Bug 42705: Update our preferences to account for new line height [tor-browser] + * Bug 42762: Review Mozilla 1498512: Enable by default setSinkId pref [tor-browser] + * Bug 42788: Review Mozilla 1828606: Add Recently Closed tabs to its own page [tor-browser] + * Bug 42789: Review Mozilla 1830157: Add new telemetry probe to determine how often an extension process had to be... [tor-browser] + * Bug 42792: Review Mozilla 1837097: Implement "Show less frequently" behavior for Pocket suggestions [tor-browser] + * Bug 42810: Review Mozilla 1840584: Support autofilling `first name` and `last name` field in a credit card form [tor-browser] + * Bug 42814: Opt out from Firefox relay by default. [tor-browser] + * Bug 42818: Review Mozilla 1841295: Update PocketSuggestions for the final suggestions schema [tor-browser] + * Bug 42835: Filter data transfers containing files [tor-browser] + * Bug 42846: Review Mozilla 1841995: Enable Credit Card Autofill in ES and IT in nightly [tor-browser] + * Bug 42847: Review Mozilla 1841996: Enable Credit Card Autofill in AT, BE, and PL in nightly [tor-browser] + * Bug 42848: Review Mozilla 1841998: Enable Credit Card Autofill for ES,IT,AT,BE and PL locales in release. r=dimi... [tor-browser] + * Bug 42855: Review Mozilla 1843130: Pocket newtab use new recs api for locale list config if new api pref is set [tor-browser] + * Bug 42862: Review Mozilla 1845428: Instrument Translations Panel With Telemetry [tor-browser] + * Bug 42863: Review Mozilla 1847150: Add more TranslationsTelemetry event keys for panel open r=gregtatum, a=dsmith [tor-browser] + * Bug 42864: Review Mozilla 1848845: Pocket newtab migrate existing markets to new API. r=gvn a=RyanVM [tor-browser] + * Bug 42872: Disable translations until audited and solved the UX problems [tor-browser] + * Bug 42886: Review Mozilla 1848048: Add a result menu to disable trending results. r=dao,fluent-reviewers,setting... [tor-browser] + * Bug 42996: Review Mozilla 1517786: Implement and ship CanvasRenderingContext2D.getContextAttributes() [tor-browser] + * Windows + macOS + * Bug 42774: Review Mozilla 1848815: Add a user-facing setting to enable enterprise roots import, and enable it by default [tor-browser] + * Bug 43021: Revert the OS deprecation notification introduced in #42347 [tor-browser] + * Windows + * Bug 43051: windows: remove UI for "open Tor Browser automatically when computer starts" [tor-browser] + * Build System + * All Platforms + * Bug 42799: Do not run lint pipelines on new tag [tor-browser] + * Bug 41204: NoScript isn't added automatically to Mullvad Browser changelogs [tor-browser-build] + * Windows + * Bug 41185: Drop Windows 7 support for 14.0 from build tools [tor-browser-build] + * Bug 41201: Bump the Windows version checked by the installer [tor-browser-build] + +Mullvad Browser 13.5.2 - August 06 2024 + * All Platforms + * Updated Firefox to 115.14.0esr + * Updated NoScript to 11.4.31 + * Updated uBlock Origin to 1.59.0 + * Bug 325: Rebase Mullvad Browser Stable onto 115.14.0esr [mullvad-browser] + * Bug 42835: Filter data transfers containing files [tor-browser] + * Bug 43005: Backport security fixes from Firefox 129 [tor-browser] + * Build System + * All Platforms + * Bug 42470: Add merge request CI for linting [tor-browser] + * Bug 40964: Create new Tor Browser gpg subkey [tor-browser-build] + * Bug 41190: Add morgan.gpg to keyrings and list of valid keyrings in firefox+geckoview [tor-browser-build] + * Bug 41191: Remove richard.gpg from keyrings and list of valid keyrings in firefox+geckoview [tor-browser-build] + * Bug 41204: NoScript isn't added automatically to Mullvad Browser changelogs [tor-browser-build] + Mullvad Browser 14.0a1 - July 24 2024 * All Platforms * Updated Firefox to 128.0esr
===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -1,3 +1,109 @@ +Tor Browser 14.0a2 - August 16 2024 + * All Platforms + * Updated NoScript to 11.4.34 + * Bug 42759: CI: remove localization file names that are in neither 14.0 nor 13.5 branches [tor-browser] + * Bug 42762: Review Mozilla 1498512: Enable by default setSinkId pref [tor-browser] + * Bug 42788: Review Mozilla 1828606: Add Recently Closed tabs to its own page [tor-browser] + * Bug 42789: Review Mozilla 1830157: Add new telemetry probe to determine how often an extension process had to be... [tor-browser] + * Bug 42792: Review Mozilla 1837097: Implement "Show less frequently" behavior for Pocket suggestions [tor-browser] + * Bug 42810: Review Mozilla 1840584: Support autofilling `first name` and `last name` field in a credit card form [tor-browser] + * Bug 42814: Opt out from Firefox relay by default. [tor-browser] + * Bug 42818: Review Mozilla 1841295: Update PocketSuggestions for the final suggestions schema [tor-browser] + * Bug 42835: Filter data transfers containing files [tor-browser] + * Bug 42846: Review Mozilla 1841995: Enable Credit Card Autofill in ES and IT in nightly [tor-browser] + * Bug 42847: Review Mozilla 1841996: Enable Credit Card Autofill in AT, BE, and PL in nightly [tor-browser] + * Bug 42848: Review Mozilla 1841998: Enable Credit Card Autofill for ES,IT,AT,BE and PL locales in release. r=dimi... [tor-browser] + * Bug 42886: Review Mozilla 1848048: Add a result menu to disable trending results. r=dao,fluent-reviewers,setting... [tor-browser] + * Bug 42996: Review Mozilla 1517786: Implement and ship CanvasRenderingContext2D.getContextAttributes() [tor-browser] + * Bug 42999: Rebase Tor Browser Alpha onto 128.1.0esr [tor-browser] + * Bug 43011: Ship only one copy of the MIT license, like upstream. [tor-browser] + * Bug 41207: Upgrade lyrebird to 0.3.0 [tor-browser-build] + * Windows + macOS + Linux + * Updated Firefox to 128.1.0esr + * Bug 42488: ESR 128: Remove role="code" from tor circuit panel [tor-browser] + * Bug 42596: Several console errors: Console.maxLogLevelPref used with a non-existing pref: [tor-browser] + * Bug 42612: Re-implement moz-toggle customizations for ESR 128 [tor-browser] + * Bug 42622: Offline state is unreachable in about:torconnect (first bootstrap attempt) [tor-browser] + * Bug 42629: Tweak `isOnNewTabPage` patch [tor-browser] + * Bug 42641: Move from panel-footer class to moz-button-group [tor-browser] + * Bug 42642: Downloads button warning no longer announced on Orca [tor-browser] + * Bug 42643: downloads panel separator has mismatched margin [tor-browser] + * Bug 42644: toolbar rules in panelUI-shared.css are unneccessary [tor-browser] + * Bug 42661: Re-run update_emojis.py and update locales [tor-browser] + * Bug 42662: Use data-hidden-from-search for hiding the firefox connection settings [tor-browser] + * Bug 42663: Tor Browser "Connection" settings missing a tooltip [tor-browser] + * Bug 42667: Add description-deemphasized class to our additions to about:preferences [tor-browser] + * Bug 42679: Use a more robust approach to hide the "tracking protection" urlbar button [tor-browser] + * Bug 42691: Simplified bridge cards prevent censored users from modifying built-in bridges [tor-browser] + * Bug 42695: Use `--arrowpanel-` variables for tor circuit panel spacing [tor-browser] + * Bug 42696: Update `mail` icon used in "Find more bridges" [tor-browser] + * Bug 42697: Remove padding to left of `tor-bridges-provider-list` under "Find more bridges" [tor-browser] + * Bug 42699: Drop level="top" attribute from panels [tor-browser] + * Bug 42700: Remove !nodes condition from gTorCircuitPanel._updateCurrentBrowser [tor-browser] + * Bug 42704: Drop the badged="true" attribute from security level button [tor-browser] + * Bug 42705: Update our preferences to account for new line height [tor-browser] + * Bug 42713: Some --in-content CSS variables were renamed/removed [tor-browser] + * Bug 42806: Use the `lh` CSS unit [tor-browser] + * Bug 42855: Review Mozilla 1843130: Pocket newtab use new recs api for locale list config if new api pref is set [tor-browser] + * Bug 42862: Review Mozilla 1845428: Instrument Translations Panel With Telemetry [tor-browser] + * Bug 42863: Review Mozilla 1847150: Add more TranslationsTelemetry event keys for panel open r=gregtatum, a=dsmith [tor-browser] + * Bug 42864: Review Mozilla 1848845: Pocket newtab migrate existing markets to new API. r=gvn a=RyanVM [tor-browser] + * Bug 42872: Disable translations until audited and solved the UX problems [tor-browser] + * Windows + macOS + * Bug 42774: Review Mozilla 1848815: Add a user-facing setting to enable enterprise roots import, and enable it by default [tor-browser] + * Bug 43021: Revert the OS deprecation notification introduced in #42347 [tor-browser] + * Windows + * Bug 43051: windows: remove UI for "open Tor Browser automatically when computer starts" [tor-browser] + * Android + * Updated GeckoView to 128.1.0esr + * Bug 43048: Firefox logo on splash [tor-browser] + * Bug 43050: Center text in connect buttons [tor-browser] + * Bug 43057: fenix/.../search/list.json failing linting [tor-browser] + * Build System + * All Platforms + * Updated Go to 1.23.0 + * Bug 42799: Do not run lint pipelines on new tag [tor-browser] + * Bug 43014: Add purgecaches to the dev build [tor-browser] + * Bug 41203: Tor Blog generation script uses the wrong url scheme for alpha releases [tor-browser-build] + * Bug 41213: Update the update_manual.py script to notify when no changes needed [tor-browser-build] + * Windows + macOS + Linux + * Bug 42668: Drop torconnect rule in eslint-plugin-mozilla [tor-browser] + * Windows + * Bug 41185: Drop Windows 7 support for 14.0 from build tools [tor-browser-build] + * Bug 41201: Bump the Windows version checked by the installer [tor-browser-build] + * macOS + * Bug 41202: 14.0a1 fails to run on macOS because of invalid signature [tor-browser-build] + * Android + * Bug 40544: Bump Java 8 version to something more recent [tor-browser-build] + * Bug 41123: Drop the firefox-android project [tor-browser-build] + * Bug 41171: Switch Android containers to Debian bookworm [tor-browser-build] + * Bug 41172: Refactor the android-toolchain project [tor-browser-build] + * Bug 41178: Force IPv4 when downloading in fix_gradle_deps.py [tor-browser-build] + * Bug 41200: Remove allowed_addons.json and the related tools [tor-browser-build] + * Bug 41210: Use tor-expert-bundle-aar in geckoview/build_apk [tor-browser-build] + * Bug 41214: Update geckoview/config to be more like firefox/config [tor-browser-build] + * Bug 41217: Update realprep.py script to handle Firefox 128-based Tor Browser Android [tor-browser-build] + +Tor Browser 13.5.2 - August 06 2024 + * All Platforms + * Updated NoScript to 11.4.31 + * Bug 42835: Filter data transfers containing files [tor-browser] + * Bug 42998: Rebase Tor Browser stable onto 115.14.0esr [tor-browser] + * Bug 43005: Backport security fixes from Firefox 129 [tor-browser] + * Windows + macOS + Linux + * Updated Firefox to 115.14.0esr + * Android + * Updated GeckoView to 115.14.0esr + * Build System + * All Platforms + * Bug 42470: Add merge request CI for linting [tor-browser] + * Bug 40964: Create new Tor Browser gpg subkey [tor-browser-build] + * Bug 41168: deploy_update_responses-$channel.sh should check that it is not reverting an update in an other channel [tor-browser-build] + * Bug 41184: Update generate blog post script to use new blog header images [tor-browser-build] + * Bug 41190: Add morgan.gpg to keyrings and list of valid keyrings in firefox+geckoview [tor-browser-build] + * Bug 41191: Remove richard.gpg from keyrings and list of valid keyrings in firefox+geckoview [tor-browser-build] + * Bug 41204: NoScript isn't added automatically to Mullvad Browser changelogs [tor-browser-build] + Tor Browser 14.0a1 - July 24 2024 * All Platforms * Updated NoScript to 11.4.31
===================================== projects/browser/config ===================================== @@ -104,12 +104,12 @@ input_files: enable: '[% ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.mozilla.org/firefox/downloads/file/4320635/noscript-11.4.31.x... + - URL: https://addons.mozilla.org/firefox/downloads/file/4333280/noscript-11.4.34.x... name: noscript - sha256sum: b22c007534471a8fb74378e970ba79a536a44f88d81ad3852273b82a466d10c7 - - URL: https://addons.mozilla.org/firefox/downloads/file/4290466/ublock_origin-1.58... + sha256sum: e538163118e8e9dcabd6306b8a9abb3fccb556b7d87b68e18aa0997d121ba00a + - URL: https://addons.mozilla.org/firefox/downloads/file/4328681/ublock_origin-1.59... name: ublock-origin - sha256sum: 470c56994a7174db21578adce598b158a5dc0970c87c5cfe889ac632bd3085ea + sha256sum: 1db9c676a07d141f8d36dbbc24f9e3d64a6cc2340dbfc6c848bc4395f96cfb14 enable: '[% c("var/mullvad-browser") %]' - URL: https://cdn.mullvad.net/browser-extension/0.9.0/mullvad-browser-extension-0.... name: mullvad-extension
===================================== projects/firefox/config ===================================== @@ -19,7 +19,7 @@ var: browser_series: '14.0' browser_rebase: 1 browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]' - browser_build: 1 + browser_build: 6 branding_directory_prefix: 'tb' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]' @@ -107,6 +107,7 @@ targets: gitlab_project: https://gitlab.torproject.org/tpo/applications/mullvad-browser updater_url: 'https://cdn.mullvad.net/browser/update_responses/update_1/' nightly_updates_publish_dir_prefix: mullvadbrowser- + browser_build: 2
linux-x86_64: var:
===================================== projects/geckoview/config ===================================== @@ -16,9 +16,12 @@ container: build_apk: 1
var: - geckoview_version: 128.1.0esr - browser_branch: 14.0-1 - browser_build: 1 + firefox_platform_version: '128.1.0' + geckoview_version: '[% c("var/firefox_platform_version") %]esr' + browser_series: '14.0' + browser_rebase: 1 + browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]' + browser_build: 6 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser git_commit: '[% exec("git rev-parse HEAD") %]'
===================================== projects/go/config ===================================== @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: '1.22.5' +version: '1.23.0' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' container: use_container: 1 @@ -126,7 +126,7 @@ input_files: enable: '[% ! c("var/linux") %]' - URL: 'https://go.dev/dl/go%5B% c("version") %].src.tar.gz' name: go - sha256sum: ac9c723f224969aee624bc34fd34c9e13f2a212d75c71c807de644bb46e112f6 + sha256sum: 42b7a8e80d805daa03022ed3fde4321d4c3bf2c990a144165d01eeecd6f699c6 - project: go-bootstrap name: go-bootstrap target_replace:
===================================== projects/translation/config ===================================== @@ -12,13 +12,13 @@ compress_tar: 'gz' steps: base-browser: base-browser: '[% INCLUDE build %]' - git_hash: b8972d5a7409c964c832c6ccb7703f0451e000cd + git_hash: b954fa2a14f1617d722fab973dc1f25f6bc32f94 targets: nightly: git_hash: 'base-browser' tor-browser: tor-browser: '[% INCLUDE build %]' - git_hash: dd38ffa906e83acfaf5af94d5823feee52eb86f2 + git_hash: 1df2c214ef69a0211de3a7fc96b47a6edca1a210 targets: nightly: git_hash: 'tor-browser' @@ -32,7 +32,7 @@ steps: fenix: '[% INCLUDE build %]' # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. - git_hash: 5799bb4b0104159a79ad43334f89ac26c36a1465 + git_hash: f27eda6d10a4585a8402c57548f9228e4927b2fa compress_tar: 'zst' targets: nightly:
===================================== rbm.conf ===================================== @@ -73,18 +73,18 @@ buildconf: git_signtag_opt: '-s'
var: - torbrowser_version: '14.0a1' + torbrowser_version: '14.0a2' torbrowser_build: 'build1' # This should be the date of when the build is started. For the build # to be reproducible, browser_release_date should always be in the past. - browser_release_date: '2024/07/24 21:00:00' + browser_release_date: '2024/08/16 00:08:31' browser_release_date_timestamp: '[% USE date; date.format(c("var/browser_release_date"), "%s") %]' updater_enabled: 1 build_mar: 1 torbrowser_incremental_from: + - 14.0a1 - 13.5a9 - 13.5a8 - - 13.5a7 mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]'
# By default, we sort the list of installed packages. This allows sharing
===================================== tools/relprep.py ===================================== @@ -126,8 +126,6 @@ class ReleasePreparation: self.branch_sanity_check()
self.update_firefox() - if self.android: - self.update_firefox_android() self.update_translations() self.update_addons()
@@ -228,11 +226,9 @@ class ReleasePreparation: if self.android: assert tag_tb config = self.load_config("geckoview") - config["var"]["geckoview_version"] = tag_tb[0] - config["var"][ - "browser_branch" - ] = f"{self.version.major}-{tag_tb[1]}" - config["var"]["browser_build"] = tag_tb[2] + config["var"]["firefox_platform_version"] = platform + config["var"]["browser_rebase"] = rebase + config["var"]["browser_build"] = build self.save_config("geckoview", config) logger.debug("GeckoView configuration saved")
@@ -258,26 +254,6 @@ class ReleasePreparation: # firefox-version, rebase, build return (m.group(2), int(m.group(4)), int(m.group(5)))
- def update_firefox_android(self): - logger.info("Updating firefox-android") - config = self.load_config("firefox-android") - repo = Repo(self.base_path / "git_clones/firefox-android") - repo.remotes["origin"].fetch() - tags = get_sorted_tags(repo) - for t in tags: - m = re.match( - r"firefox-android-([^-]+)-([\d.]+)-(\d+)-build(\d+)", t.tag - ) - if not m or m.group(2) != self.version.major: - logger.debug("Discarding firefox-android tag: %s", t.tag) - continue - logger.debug("Using firefox-android tag: %s", t.tag) - config["var"]["fenix_version"] = m.group(1) - config["var"]["browser_branch"] = m.group(2) + "-" + m.group(3) - config["var"]["browser_build"] = int(m.group(4)) - break - self.save_config("firefox-android", config) - def update_translations(self): logger.info("Updating translations") repo = Repo(self.base_path / "git_clones/translation")
===================================== tools/update_manual.py ===================================== @@ -94,7 +94,8 @@ def update_manual(auth_token, base_path):
return update_config(base_path, pipeline_id, sha256)
- if __name__ == "__main__": if update_manual(load_token(), Path(__file__).parent.parent): print("Manual config updated, remember to stage it!") + else: + print("Manual already latest")
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/0...