morgan pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits:

11 changed files:

Changes:

  • .gitlab/issue_templates/Release Prep - Tor Browser Alpha.md
    ... ... @@ -39,7 +39,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch
    39 39 
       - [ ] `var/torbrowser_version` : update to next version
    40 40 
       - [ ] `var/torbrowser_build` : update to `$(TOR_BROWSER_BUILD_N)`
    41 41 
       - [ ] `var/browser_release_date` : update to build date. For the build to be reproducible, the date should be in the past when building.
    42 
    -  - [ ] ***(Desktop Only)***`var/torbrowser_incremental_from` : update to previous Desktop version
    42 
    +  - [ ] ***(Desktop Only)*** `var/torbrowser_incremental_from` : update to previous Desktop version
    43 43 
         - **NOTE**: We try to build incrementals for the previous 3 desktop versions except in the case of a watershed update
    44 44 
         - **IMPORTANT**: Really *actually* make sure this is the previous Desktop version or else the `make torbrowser-incrementals-*` step will fail
    45 45 
     - [ ] Update Desktop-specific build configs
    ... ... @@ -49,16 +49,10 @@ Tor Browser Alpha (and Nightly) are on the `main` branch
    49 49 
     - [ ] Update Android-specific build configs
    50 50 
       - [ ] Update `projects/geckoview/config`
    51 51 
         - [ ] `browser_build` : update to match `tor-browser` tag
    52 
    -    - [ ] ***(Optional)*** `var/geckoview_version` : update to latest `$(ESR_VERSION)` if rebased
    53 
    -  - [ ] ***(Optional)*** Update `projects/tor-android-service/config`
    54 
    -    - [ ] `git_hash` : update with `HEAD` commit of project's `main` branch
    52 
    +    - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased
    55 53 
       - [ ] ***(Optional)*** Update `projects/application-services/config`:
    56 54 
         **NOTE** we don't currently have any of our own patches for this project
    57 55 
         - [ ] `git_hash` : update to appropriate git commit associated with `$(ESR_VERSION)`
    58 
    -  - [ ] ***(Optional)*** Update `projects/firefox-android/config`:
    59 
    -    - [ ] `fenix_version` : update to match alpha `firefox-android` build tag
    60 
    -    - [ ] `browser_branch` : update to match alpha `firefox-android` build tag
    61 
    -    - [ ] `browser_build` : update to match alpha `firefox-android` build tag
    62 56 
     - [ ] Update `projects/translation/config`:
    63 57 
       - [ ] run `make list_translation_updates-alpha` to get updated hashes
    64 58 
       - [ ] `steps/base-browser/git_hash` : update with `HEAD` commit of project's `base-browser` branch

  • projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt
    1 
    +Mullvad Browser 14.0a2 - August 16 2024
    2 
    + * All Platforms
    3 
    +   * Updated Firefox to 128.1.0esr
    4 
    +   * Updated NoScript to 11.4.34
    5 
    +   * Updated uBlock Origin to 1.59.0
    6 
    +   * Bug 326: Rebase Mullvad Browser Alpha onto 128.1.0esr [mullvad-browser]
    7 
    +   * Bug 42596: Several console errors: Console.maxLogLevelPref used with a non-existing pref: [tor-browser]
    8 
    +   * Bug 42641: Move from panel-footer class to moz-button-group [tor-browser]
    9 
    +   * Bug 42644: toolbar rules in panelUI-shared.css are unneccessary [tor-browser]
    10 
    +   * Bug 42667: Add description-deemphasized class to our additions to about:preferences [tor-browser]
    11 
    +   * Bug 42679: Use a more robust approach to hide the "tracking protection" urlbar button [tor-browser]
    12 
    +   * Bug 42699: Drop level="top" attribute from panels [tor-browser]
    13 
    +   * Bug 42704: Drop the badged="true" attribute from security level button [tor-browser]
    14 
    +   * Bug 42705: Update our preferences to account for new line height [tor-browser]
    15 
    +   * Bug 42762: Review Mozilla 1498512: Enable by default setSinkId pref [tor-browser]
    16 
    +   * Bug 42788: Review Mozilla 1828606: Add Recently Closed tabs to its own page [tor-browser]
    17 
    +   * Bug 42789: Review Mozilla 1830157: Add new telemetry probe to determine how often an extension process had to be... [tor-browser]
    18 
    +   * Bug 42792: Review Mozilla 1837097: Implement "Show less frequently" behavior for Pocket suggestions [tor-browser]
    19 
    +   * Bug 42810: Review Mozilla 1840584: Support autofilling `first name` and `last name` field in a credit card form [tor-browser]
    20 
    +   * Bug 42814: Opt out from Firefox relay by default. [tor-browser]
    21 
    +   * Bug 42818: Review Mozilla 1841295: Update PocketSuggestions for the final suggestions schema [tor-browser]
    22 
    +   * Bug 42835: Filter data transfers containing files [tor-browser]
    23 
    +   * Bug 42846: Review Mozilla 1841995: Enable Credit Card Autofill in ES and IT in nightly [tor-browser]
    24 
    +   * Bug 42847: Review Mozilla 1841996: Enable Credit Card Autofill in AT, BE, and PL in nightly [tor-browser]
    25 
    +   * Bug 42848: Review Mozilla 1841998: Enable Credit Card Autofill for ES,IT,AT,BE and PL locales in release. r=dimi... [tor-browser]
    26 
    +   * Bug 42855: Review Mozilla 1843130: Pocket newtab use new recs api for locale list config if new api pref is set [tor-browser]
    27 
    +   * Bug 42862: Review Mozilla 1845428: Instrument Translations Panel With Telemetry [tor-browser]
    28 
    +   * Bug 42863: Review Mozilla 1847150: Add more TranslationsTelemetry event keys for panel open r=gregtatum, a=dsmith [tor-browser]
    29 
    +   * Bug 42864: Review Mozilla 1848845: Pocket newtab migrate existing markets to new API. r=gvn a=RyanVM [tor-browser]
    30 
    +   * Bug 42872: Disable translations until audited and solved the UX problems [tor-browser]
    31 
    +   * Bug 42886: Review Mozilla 1848048: Add a result menu to disable trending results. r=dao,fluent-reviewers,setting... [tor-browser]
    32 
    +   * Bug 42996: Review Mozilla 1517786: Implement and ship CanvasRenderingContext2D.getContextAttributes() [tor-browser]
    33 
    + * Windows + macOS
    34 
    +   * Bug 42774: Review Mozilla 1848815: Add a user-facing setting to enable enterprise roots import, and enable it by default [tor-browser]
    35 
    +   * Bug 43021: Revert the OS deprecation notification introduced in #42347 [tor-browser]
    36 
    + * Windows
    37 
    +   * Bug 43051: windows: remove UI for "open Tor Browser automatically when computer starts" [tor-browser]
    38 
    + * Build System
    39 
    +   * All Platforms
    40 
    +     * Bug 42799: Do not run lint pipelines on new tag [tor-browser]
    41 
    +     * Bug 41204: NoScript isn't added automatically to Mullvad Browser changelogs [tor-browser-build]
    42 
    +   * Windows
    43 
    +     * Bug 41185: Drop Windows 7 support for 14.0 from build tools [tor-browser-build]
    44 
    +     * Bug 41201: Bump the Windows version checked by the installer [tor-browser-build]
    45 
    +
    46 
    +Mullvad Browser 13.5.2 - August 06 2024
    47 
    + * All Platforms
    48 
    +   * Updated Firefox to 115.14.0esr
    49 
    +   * Updated NoScript to 11.4.31
    50 
    +   * Updated uBlock Origin to 1.59.0
    51 
    +   * Bug 325: Rebase Mullvad Browser Stable onto 115.14.0esr [mullvad-browser]
    52 
    +   * Bug 42835: Filter data transfers containing files [tor-browser]
    53 
    +   * Bug 43005: Backport security fixes from Firefox 129 [tor-browser]
    54 
    + * Build System
    55 
    +   * All Platforms
    56 
    +     * Bug 42470: Add merge request CI for linting [tor-browser]
    57 
    +     * Bug 40964: Create new Tor Browser gpg subkey [tor-browser-build]
    58 
    +     * Bug 41190: Add morgan.gpg to keyrings and list of valid keyrings in firefox+geckoview [tor-browser-build]
    59 
    +     * Bug 41191: Remove richard.gpg from keyrings and list of valid keyrings in firefox+geckoview [tor-browser-build]
    60 
    +     * Bug 41204: NoScript isn't added automatically to Mullvad Browser changelogs [tor-browser-build]
    61 
    +
    1 62 
     Mullvad Browser 14.0a1 - July 24 2024
    2 63 
      * All Platforms
    3 64 
        * Updated Firefox to 128.0esr

  • projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt
    1 
    +Tor Browser 14.0a2 - August 16 2024
    2 
    + * All Platforms
    3 
    +   * Updated NoScript to 11.4.34
    4 
    +   * Bug 42759: CI: remove localization file names that are in neither 14.0 nor 13.5 branches [tor-browser]
    5 
    +   * Bug 42762: Review Mozilla 1498512: Enable by default setSinkId pref [tor-browser]
    6 
    +   * Bug 42788: Review Mozilla 1828606: Add Recently Closed tabs to its own page [tor-browser]
    7 
    +   * Bug 42789: Review Mozilla 1830157: Add new telemetry probe to determine how often an extension process had to be... [tor-browser]
    8 
    +   * Bug 42792: Review Mozilla 1837097: Implement "Show less frequently" behavior for Pocket suggestions [tor-browser]
    9 
    +   * Bug 42810: Review Mozilla 1840584: Support autofilling `first name` and `last name` field in a credit card form [tor-browser]
    10 
    +   * Bug 42814: Opt out from Firefox relay by default. [tor-browser]
    11 
    +   * Bug 42818: Review Mozilla 1841295: Update PocketSuggestions for the final suggestions schema [tor-browser]
    12 
    +   * Bug 42835: Filter data transfers containing files [tor-browser]
    13 
    +   * Bug 42846: Review Mozilla 1841995: Enable Credit Card Autofill in ES and IT in nightly [tor-browser]
    14 
    +   * Bug 42847: Review Mozilla 1841996: Enable Credit Card Autofill in AT, BE, and PL in nightly [tor-browser]
    15 
    +   * Bug 42848: Review Mozilla 1841998: Enable Credit Card Autofill for ES,IT,AT,BE and PL locales in release. r=dimi... [tor-browser]
    16 
    +   * Bug 42886: Review Mozilla 1848048: Add a result menu to disable trending results. r=dao,fluent-reviewers,setting... [tor-browser]
    17 
    +   * Bug 42996: Review Mozilla 1517786: Implement and ship CanvasRenderingContext2D.getContextAttributes() [tor-browser]
    18 
    +   * Bug 42999: Rebase Tor Browser Alpha onto 128.1.0esr [tor-browser]
    19 
    +   * Bug 43011: Ship only one copy of the MIT license, like upstream. [tor-browser]
    20 
    +   * Bug 41207: Upgrade lyrebird to 0.3.0 [tor-browser-build]
    21 
    + * Windows + macOS + Linux
    22 
    +   * Updated Firefox to 128.1.0esr
    23 
    +   * Bug 42488: ESR 128: Remove role="code" from tor circuit panel [tor-browser]
    24 
    +   * Bug 42596: Several console errors: Console.maxLogLevelPref used with a non-existing pref: [tor-browser]
    25 
    +   * Bug 42612: Re-implement moz-toggle customizations for ESR 128 [tor-browser]
    26 
    +   * Bug 42622: Offline state is unreachable in about:torconnect (first bootstrap attempt) [tor-browser]
    27 
    +   * Bug 42629: Tweak `isOnNewTabPage` patch [tor-browser]
    28 
    +   * Bug 42641: Move from panel-footer class to moz-button-group [tor-browser]
    29 
    +   * Bug 42642: Downloads button warning no longer announced on Orca [tor-browser]
    30 
    +   * Bug 42643: downloads panel separator has mismatched margin [tor-browser]
    31 
    +   * Bug 42644: toolbar rules in panelUI-shared.css are unneccessary [tor-browser]
    32 
    +   * Bug 42661: Re-run update_emojis.py and update locales [tor-browser]
    33 
    +   * Bug 42662: Use data-hidden-from-search for hiding the firefox connection settings [tor-browser]
    34 
    +   * Bug 42663: Tor Browser "Connection" settings missing a tooltip [tor-browser]
    35 
    +   * Bug 42667: Add description-deemphasized class to our additions to about:preferences [tor-browser]
    36 
    +   * Bug 42679: Use a more robust approach to hide the "tracking protection" urlbar button [tor-browser]
    37 
    +   * Bug 42691: Simplified bridge cards prevent censored users from modifying built-in bridges [tor-browser]
    38 
    +   * Bug 42695: Use `--arrowpanel-` variables for tor circuit panel spacing [tor-browser]
    39 
    +   * Bug 42696: Update `mail` icon used in "Find more bridges" [tor-browser]
    40 
    +   * Bug 42697: Remove padding to left of `tor-bridges-provider-list` under "Find more bridges" [tor-browser]
    41 
    +   * Bug 42699: Drop level="top" attribute from panels [tor-browser]
    42 
    +   * Bug 42700: Remove !nodes condition from gTorCircuitPanel._updateCurrentBrowser [tor-browser]
    43 
    +   * Bug 42704: Drop the badged="true" attribute from security level button [tor-browser]
    44 
    +   * Bug 42705: Update our preferences to account for new line height [tor-browser]
    45 
    +   * Bug 42713: Some --in-content CSS variables were renamed/removed [tor-browser]
    46 
    +   * Bug 42806: Use the `lh` CSS unit [tor-browser]
    47 
    +   * Bug 42855: Review Mozilla 1843130: Pocket newtab use new recs api for locale list config if new api pref is set [tor-browser]
    48 
    +   * Bug 42862: Review Mozilla 1845428: Instrument Translations Panel With Telemetry [tor-browser]
    49 
    +   * Bug 42863: Review Mozilla 1847150: Add more TranslationsTelemetry event keys for panel open r=gregtatum, a=dsmith [tor-browser]
    50 
    +   * Bug 42864: Review Mozilla 1848845: Pocket newtab migrate existing markets to new API. r=gvn a=RyanVM [tor-browser]
    51 
    +   * Bug 42872: Disable translations until audited and solved the UX problems [tor-browser]
    52 
    + * Windows + macOS
    53 
    +   * Bug 42774: Review Mozilla 1848815: Add a user-facing setting to enable enterprise roots import, and enable it by default [tor-browser]
    54 
    +   * Bug 43021: Revert the OS deprecation notification introduced in #42347 [tor-browser]
    55 
    + * Windows
    56 
    +   * Bug 43051: windows: remove UI for "open Tor Browser automatically when computer starts" [tor-browser]
    57 
    + * Android
    58 
    +   * Updated GeckoView to 128.1.0esr
    59 
    +   * Bug 43048: Firefox logo on splash [tor-browser]
    60 
    +   * Bug 43050: Center text in connect buttons [tor-browser]
    61 
    +   * Bug 43057: fenix/.../search/list.json failing linting [tor-browser]
    62 
    + * Build System
    63 
    +   * All Platforms
    64 
    +     * Updated Go to 1.23.0
    65 
    +     * Bug 42799: Do not run lint pipelines on new tag [tor-browser]
    66 
    +     * Bug 43014: Add purgecaches to the dev build [tor-browser]
    67 
    +     * Bug 41203: Tor Blog generation script uses the wrong url scheme for alpha releases [tor-browser-build]
    68 
    +     * Bug 41213: Update the update_manual.py script to notify when no changes needed [tor-browser-build]
    69 
    +   * Windows + macOS + Linux
    70 
    +     * Bug 42668: Drop torconnect rule in eslint-plugin-mozilla [tor-browser]
    71 
    +   * Windows
    72 
    +     * Bug 41185: Drop Windows 7 support for 14.0 from build tools [tor-browser-build]
    73 
    +     * Bug 41201: Bump the Windows version checked by the installer [tor-browser-build]
    74 
    +   * macOS
    75 
    +     * Bug 41202: 14.0a1 fails to run on macOS because of invalid signature [tor-browser-build]
    76 
    +   * Android
    77 
    +     * Bug 40544: Bump Java 8 version to something more recent [tor-browser-build]
    78 
    +     * Bug 41123: Drop the firefox-android project [tor-browser-build]
    79 
    +     * Bug 41171: Switch Android containers to Debian bookworm [tor-browser-build]
    80 
    +     * Bug 41172: Refactor the android-toolchain project [tor-browser-build]
    81 
    +     * Bug 41178: Force IPv4 when downloading in fix_gradle_deps.py [tor-browser-build]
    82 
    +     * Bug 41200: Remove allowed_addons.json and the related tools [tor-browser-build]
    83 
    +     * Bug 41210: Use tor-expert-bundle-aar in geckoview/build_apk [tor-browser-build]
    84 
    +     * Bug 41214: Update geckoview/config to be more like firefox/config [tor-browser-build]
    85 
    +     * Bug 41217: Update realprep.py script to handle Firefox 128-based Tor Browser Android [tor-browser-build]
    86 
    +
    87 
    +Tor Browser 13.5.2 - August 06 2024
    88 
    + * All Platforms
    89 
    +   * Updated NoScript to 11.4.31
    90 
    +   * Bug 42835: Filter data transfers containing files [tor-browser]
    91 
    +   * Bug 42998: Rebase Tor Browser stable onto 115.14.0esr [tor-browser]
    92 
    +   * Bug 43005: Backport security fixes from Firefox 129 [tor-browser]
    93 
    + * Windows + macOS + Linux
    94 
    +   * Updated Firefox to 115.14.0esr
    95 
    + * Android
    96 
    +   * Updated GeckoView to 115.14.0esr
    97 
    + * Build System
    98 
    +   * All Platforms
    99 
    +     * Bug 42470: Add merge request CI for linting [tor-browser]
    100 
    +     * Bug 40964: Create new Tor Browser gpg subkey [tor-browser-build]
    101 
    +     * Bug 41168: deploy_update_responses-$channel.sh should check that it is not reverting an update in an other channel [tor-browser-build]
    102 
    +     * Bug 41184: Update generate blog post script to use new blog header images [tor-browser-build]
    103 
    +     * Bug 41190: Add morgan.gpg to keyrings and list of valid keyrings in firefox+geckoview [tor-browser-build]
    104 
    +     * Bug 41191: Remove richard.gpg from keyrings and list of valid keyrings in firefox+geckoview [tor-browser-build]
    105 
    +     * Bug 41204: NoScript isn't added automatically to Mullvad Browser changelogs [tor-browser-build]
    106 
    +
    1 107 
     Tor Browser 14.0a1 - July 24 2024
    2 108 
      * All Platforms
    3 109 
        * Updated NoScript to 11.4.31

  • projects/browser/config
    ... ... @@ -104,12 +104,12 @@ input_files:
    104 104 
         enable: '[% ! c("var/android") %]'
    105 105 
       - filename: Bundle-Data
    106 106 
         enable: '[% ! c("var/android") %]'
    107 
    -  - URL: https://addons.mozilla.org/firefox/downloads/file/4320635/noscript-11.4.31.xpi
    107 
    +  - URL: https://addons.mozilla.org/firefox/downloads/file/4333280/noscript-11.4.34.xpi
    108 108 
         name: noscript
    109 
    -    sha256sum: b22c007534471a8fb74378e970ba79a536a44f88d81ad3852273b82a466d10c7
    110 
    -  - URL: https://addons.mozilla.org/firefox/downloads/file/4290466/ublock_origin-1.58.0.xpi
    109 
    +    sha256sum: e538163118e8e9dcabd6306b8a9abb3fccb556b7d87b68e18aa0997d121ba00a
    110 
    +  - URL: https://addons.mozilla.org/firefox/downloads/file/4328681/ublock_origin-1.59.0.xpi
    111 111 
         name: ublock-origin
    112 
    -    sha256sum: 470c56994a7174db21578adce598b158a5dc0970c87c5cfe889ac632bd3085ea
    112 
    +    sha256sum: 1db9c676a07d141f8d36dbbc24f9e3d64a6cc2340dbfc6c848bc4395f96cfb14
    113 113 
         enable: '[% c("var/mullvad-browser") %]'
    114 114 
       - URL: https://cdn.mullvad.net/browser-extension/0.9.0/mullvad-browser-extension-0.9.0.xpi
    115 115 
         name: mullvad-extension

  • projects/firefox/config
    ... ... @@ -19,7 +19,7 @@ var:
    19 19 
       browser_series: '14.0'
    20 20 
       browser_rebase: 1
    21 21 
       browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]'
    22 
    -  browser_build: 1
    22 
    +  browser_build: 6
    23 23 
       branding_directory_prefix: 'tb'
    24 24 
       copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
    25 25 
       nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]'
    ... ... @@ -107,6 +107,7 @@ targets:
    107 107 
           gitlab_project: https://gitlab.torproject.org/tpo/applications/mullvad-browser
    108 108 
           updater_url: 'https://cdn.mullvad.net/browser/update_responses/update_1/'
    109 109 
           nightly_updates_publish_dir_prefix: mullvadbrowser-
    110 
    +      browser_build: 2
    110 111
    111 112 
       linux-x86_64:
    112 113 
         var:

  • projects/geckoview/config
    ... ... @@ -16,9 +16,12 @@ container:
    16 16 
         build_apk: 1
    17 17
    18 18 
     var:
    19 
    -  geckoview_version: 128.1.0esr
    20 
    -  browser_branch: 14.0-1
    21 
    -  browser_build: 1
    19 
    +  firefox_platform_version: '128.1.0'
    20 
    +  geckoview_version: '[% c("var/firefox_platform_version") %]esr'
    21 
    +  browser_series: '14.0'
    22 
    +  browser_rebase: 1
    23 
    +  browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]'
    24 
    +  browser_build: 6
    22 25 
       copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
    23 26 
       gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser
    24 27 
       git_commit: '[% exec("git rev-parse HEAD") %]'

  • projects/go/config
    1 1 
     # vim: filetype=yaml sw=2
    2 
    -version: '1.22.5'
    2 
    +version: '1.23.0'
    3 3 
     filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]'
    4 4 
     container:
    5 5 
       use_container: 1
    ... ... @@ -126,7 +126,7 @@ input_files:
    126 126 
         enable: '[% ! c("var/linux") %]'
    127 127 
       - URL: 'https://go.dev/dl/go[% c("version") %].src.tar.gz'
    128 128 
         name: go
    129 
    -    sha256sum: ac9c723f224969aee624bc34fd34c9e13f2a212d75c71c807de644bb46e112f6
    129 
    +    sha256sum: 42b7a8e80d805daa03022ed3fde4321d4c3bf2c990a144165d01eeecd6f699c6
    130 130 
       - project: go-bootstrap
    131 131 
         name: go-bootstrap
    132 132 
         target_replace:

  • projects/translation/config
    ... ... @@ -12,13 +12,13 @@ compress_tar: 'gz'
    12 12 
     steps:
    13 13 
       base-browser:
    14 14 
         base-browser: '[% INCLUDE build %]'
    15 
    -    git_hash: b8972d5a7409c964c832c6ccb7703f0451e000cd
    15 
    +    git_hash: b954fa2a14f1617d722fab973dc1f25f6bc32f94
    16 16 
         targets:
    17 17 
           nightly:
    18 18 
             git_hash: 'base-browser'
    19 19 
       tor-browser:
    20 20 
         tor-browser: '[% INCLUDE build %]'
    21 
    -    git_hash: dd38ffa906e83acfaf5af94d5823feee52eb86f2
    21 
    +    git_hash: 1df2c214ef69a0211de3a7fc96b47a6edca1a210
    22 22 
         targets:
    23 23 
           nightly:
    24 24 
             git_hash: 'tor-browser'
    ... ... @@ -32,7 +32,7 @@ steps:
    32 32 
         fenix: '[% INCLUDE build %]'
    33 33 
         # We need to bump the commit before releasing but just pointing to a branch
    34 34 
         # might cause too much rebuidling of the Firefox part.
    35 
    -    git_hash: 5799bb4b0104159a79ad43334f89ac26c36a1465
    35 
    +    git_hash: f27eda6d10a4585a8402c57548f9228e4927b2fa
    36 36 
         compress_tar: 'zst'
    37 37 
         targets:
    38 38 
           nightly:

  • rbm.conf
    ... ... @@ -73,18 +73,18 @@ buildconf:
    73 73 
       git_signtag_opt: '-s'
    74 74
    75 75 
     var:
    76 
    -  torbrowser_version: '14.0a1'
    76 
    +  torbrowser_version: '14.0a2'
    77 77 
       torbrowser_build: 'build1'
    78 78 
       # This should be the date of when the build is started. For the build
    79 79 
       # to be reproducible, browser_release_date should always be in the past.
    80 
    -  browser_release_date: '2024/07/24 21:00:00'
    80 
    +  browser_release_date: '2024/08/16 00:08:31'
    81 81 
       browser_release_date_timestamp: '[% USE date; date.format(c("var/browser_release_date"), "%s") %]'
    82 82 
       updater_enabled: 1
    83 83 
       build_mar: 1
    84 84 
       torbrowser_incremental_from:
    85 
    +    - 14.0a1
    85 86 
         - 13.5a9
    86 87 
         - 13.5a8
    87 
    -    - 13.5a7
    88 88 
       mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]'
    89 89
    90 90 
       # By default, we sort the list of installed packages. This allows sharing

  • tools/relprep.py
    ... ... @@ -126,8 +126,6 @@ class ReleasePreparation:
    126 126 
             self.branch_sanity_check()
    127 127
    128 128 
             self.update_firefox()
    129 
    -        if self.android:
    130 
    -            self.update_firefox_android()
    131 129 
             self.update_translations()
    132 130 
             self.update_addons()
    133 131
    ... ... @@ -228,11 +226,9 @@ class ReleasePreparation:
    228 226 
             if self.android:
    229 227 
                 assert tag_tb
    230 228 
                 config = self.load_config("geckoview")
    231 
    -            config["var"]["geckoview_version"] = tag_tb[0]
    232 
    -            config["var"][
    233 
    -                "browser_branch"
    234 
    -            ] = f"{self.version.major}-{tag_tb[1]}"
    235 
    -            config["var"]["browser_build"] = tag_tb[2]
    229 
    +            config["var"]["firefox_platform_version"] = platform
    230 
    +            config["var"]["browser_rebase"] = rebase
    231 
    +            config["var"]["browser_build"] = build
    236 232 
                 self.save_config("geckoview", config)
    237 233 
                 logger.debug("GeckoView configuration saved")
    238 234
    ... ... @@ -258,26 +254,6 @@ class ReleasePreparation:
    258 254 
                     # firefox-version, rebase, build
    259 255 
                     return (m.group(2), int(m.group(4)), int(m.group(5)))
    260 256
    261 
    -    def update_firefox_android(self):
    262 
    -        logger.info("Updating firefox-android")
    263 
    -        config = self.load_config("firefox-android")
    264 
    -        repo = Repo(self.base_path / "git_clones/firefox-android")
    265 
    -        repo.remotes["origin"].fetch()
    266 
    -        tags = get_sorted_tags(repo)
    267 
    -        for t in tags:
    268 
    -            m = re.match(
    269 
    -                r"firefox-android-([^-]+)-([\d\.]+)-(\d+)-build(\d+)", t.tag
    270 
    -            )
    271 
    -            if not m or m.group(2) != self.version.major:
    272 
    -                logger.debug("Discarding firefox-android tag: %s", t.tag)
    273 
    -                continue
    274 
    -            logger.debug("Using firefox-android tag: %s", t.tag)
    275 
    -            config["var"]["fenix_version"] = m.group(1)
    276 
    -            config["var"]["browser_branch"] = m.group(2) + "-" + m.group(3)
    277 
    -            config["var"]["browser_build"] = int(m.group(4))
    278 
    -            break
    279 
    -        self.save_config("firefox-android", config)
    280 
    -
    281 257 
         def update_translations(self):
    282 258 
             logger.info("Updating translations")
    283 259 
             repo = Repo(self.base_path / "git_clones/translation")

  • tools/update_manual.py
    ... ... @@ -94,7 +94,8 @@ def update_manual(auth_token, base_path):
    94 94
    95 95 
         return update_config(base_path, pipeline_id, sha256)
    96 96
    97 
    -
    98 97 
     if __name__ == "__main__":
    99 98 
         if update_manual(load_token(), Path(__file__).parent.parent):
    100 99 
             print("Manual config updated, remember to stage it!")
    100 
    +    else:
    101 
    +        print("Manual already latest")

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help