[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser-build][main] 2 commits: Bug 40983: Bump versions for 13.5.

Title: GitLab

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits:

  • 04fb18b1
    by Pier Angelo Vendrame at 2023-10-19T09:16:51+02:00 
    Bug 40983: Bump versions for 13.5.

Also, update the MB extension, that was updated only on the 13.0
branch.
  • 6c469013
    by Pier Angelo Vendrame at 2023-10-19T09:16:57+02:00 
    Revert "Bug 40933: Add symlinks to have incrementals between 12.5.x and 13.0"

This reverts commit a21969281d18941b69a94b994b0797f8b88ad45f.

We do not need it anymore, because the latest alphas already used the
new naming scheme.

8 changed files:

Changes:

  • Makefile
    ... ... @@ -183,7 +183,6 @@ torbrowser-testbuild-src: submodule-update
    183 183 
     torbrowser-incrementals-release: submodule-update
    184 184 
     	$(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals --target torbrowser
    185 185 
     	tools/update-responses/download_missing_versions release
    186 
    -	$(rbm) build release --step link_old_mar_filenames --target release --target torbrowser
    187 186 
     	tools/update-responses/gen_incrementals release
    188 187 
     	$(rbm) build release --step hash_incrementals --target release --target torbrowser
    189 188
    ... ... @@ -196,7 +195,6 @@ torbrowser-incrementals-release-unsigned: submodule-update
    196 195 
     torbrowser-incrementals-alpha: submodule-update
    197 196 
     	$(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals --target torbrowser
    198 197 
     	tools/update-responses/download_missing_versions alpha
    199 
    -	$(rbm) build release --step link_old_mar_filenames --target alpha --target torbrowser
    200 198 
     	tools/update-responses/gen_incrementals alpha
    201 199 
     	$(rbm) build release --step hash_incrementals --target alpha --target torbrowser
    202 200
    ... ... @@ -223,14 +221,12 @@ torbrowser-dmg2mar-release: submodule-update
    223 221 
     	$(rbm) build release --step update_responses_config --target release --target signed --target torbrowser
    224 222 
     	$(rbm) build release --step dmg2mar --target release --target signed --target torbrowser
    225 223 
     	tools/update-responses/download_missing_versions release
    226 
    -	$(rbm) build release --step link_old_mar_filenames --target release --target torbrowser
    227 224 
     	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals release
    228 225
    229 226 
     torbrowser-dmg2mar-alpha: submodule-update
    230 227 
     	$(rbm) build release --step update_responses_config --target alpha --target signed --target torbrowser
    231 228 
     	$(rbm) build release --step dmg2mar --target alpha --target signed --target torbrowser
    232 229 
     	tools/update-responses/download_missing_versions alpha
    233 
    -	$(rbm) build release --step link_old_mar_filenames --target alpha --target torbrowser
    234 230 
     	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals alpha
    235 231
    236 232
    ... ... @@ -515,7 +511,6 @@ mullvadbrowser-testbuild-src: submodule-update
    515 511 
     mullvadbrowser-incrementals-release: submodule-update
    516 512 
     	$(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals --target mullvadbrowser
    517 513 
     	tools/update-responses/download_missing_versions release
    518 
    -	$(rbm) build release --step link_old_mar_filenames --target release --target mullvadbrowser
    519 514 
     	tools/update-responses/gen_incrementals release
    520 515 
     	$(rbm) build release --step hash_incrementals --target release --target mullvadbrowser
    521 516
    ... ... @@ -528,7 +523,6 @@ mullvadbrowser-incrementals-release-unsigned: submodule-update
    528 523 
     mullvadbrowser-incrementals-alpha: submodule-update
    529 524 
     	$(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals --target mullvadbrowser
    530 525 
     	tools/update-responses/download_missing_versions alpha
    531 
    -	$(rbm) build release --step link_old_mar_filenames --target alpha --target mullvadbrowser
    532 526 
     	tools/update-responses/gen_incrementals alpha
    533 527 
     	$(rbm) build release --step hash_incrementals --target alpha --target mullvadbrowser
    534 528
    ... ... @@ -555,14 +549,12 @@ mullvadbrowser-dmg2mar-release: submodule-update
    555 549 
     	$(rbm) build release --step update_responses_config --target release --target signed --target mullvadbrowser
    556 550 
     	$(rbm) build release --step dmg2mar --target release --target signed --target mullvadbrowser
    557 551 
     	tools/update-responses/download_missing_versions release
    558 
    -	$(rbm) build release --step link_old_mar_filenames --target release --target mullvadbrowser
    559 552 
     	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals release
    560 553
    561 554 
     mullvadbrowser-dmg2mar-alpha: submodule-update
    562 555 
     	$(rbm) build release --step update_responses_config --target alpha --target signed --target mullvadbrowser
    563 556 
     	$(rbm) build release --step dmg2mar --target alpha --target signed --target mullvadbrowser
    564 557 
     	tools/update-responses/download_missing_versions alpha
    565 
    -	$(rbm) build release --step link_old_mar_filenames --target alpha --target mullvadbrowser
    566 558 
     	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals alpha
    567 559
    568 560

  • projects/browser/config
    ... ... @@ -95,9 +95,9 @@ input_files:
    95 95 
         name: ublock-origin
    96 96 
         sha256sum: e8ee3f9d597a6d42db9d73fe87c1d521de340755fd8bfdd69e41623edfe096d6
    97 97 
         enable: '[% c("var/mullvad-browser") %]'
    98 
    -  - URL: https://github.com/mullvad/browser-extension/releases/download/v0.8.3-firefox-beta/mullvad-browser-extension-0.8.3.xpi
    98 
    +  - URL: https://cdn.mullvad.net/browser-extension/0.8.4/mullvad-browser-extension-0.8.4.xpi
    99 99 
         name: mullvad-extension
    100 
    -    sha256sum: e531ce6e809091eb40848874ea9e695bce61196397b6d8238ab582a152e02ac7
    100 
    +    sha256sum: a0057a37482e178331cde7a6fd3c100315fcfc26e804aa37c9281f412d24cb79
    101 101 
         enable: '[% c("var/mullvad-browser") %]'
    102 102 
       - filename: 'gtk3-settings.ini'
    103 103 
         enable: '[% c("var/linux") %]'

  • projects/firefox-android/config
    ... ... @@ -15,8 +15,8 @@ container:
    15 15
    16 16 
     var:
    17 17 
       fenix_version: 115.2.1
    18 
    -  browser_branch: 13.0-1
    19 
    -  browser_build: 5
    18 
    +  browser_branch: 13.5-1
    19 
    +  browser_build: 1
    20 20 
       variant: Beta
    21 21 
       # This should be updated when the list of gradle dependencies is changed.
    22 22 
       gradle_dependencies_version: 1

  • projects/firefox/config
    ... ... @@ -14,11 +14,11 @@ container:
    14 14 
       use_container: 1
    15 15
    16 16 
     var:
    17 
    -  firefox_platform_version: 115.3.0
    17 
    +  firefox_platform_version: 115.4.0
    18 18 
       firefox_version: '[% c("var/firefox_platform_version") %]esr'
    19 
    -  browser_series: '13.0'
    19 
    +  browser_series: '13.5'
    20 20 
       browser_branch: '[% c("var/browser_series") %]-1'
    21 
    -  browser_build: 3
    21 
    +  browser_build: 1
    22 22 
       branding_directory_prefix: 'tb'
    23 23 
       copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
    24 24 
       nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]'

  • projects/geckoview/config
    ... ... @@ -14,9 +14,9 @@ container:
    14 14 
       use_container: 1
    15 15
    16 16 
     var:
    17 
    -  geckoview_version: 115.3.0esr
    18 
    -  browser_branch: 13.0-1
    19 
    -  browser_build: 3
    17 
    +  geckoview_version: 115.4.0esr
    18 
    +  browser_branch: 13.5-1
    19 
    +  browser_build: 1
    20 20 
       copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
    21 21 
       gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser
    22 22 
       git_commit: '[% exec("git rev-parse HEAD") %]'

  • projects/release/config
    ... ... @@ -243,11 +243,6 @@ steps:
    243 243 
         debug: 0
    244 244 
         input_files: []
    245 245 
         update_responses_config: '[% INCLUDE update_responses_config %]'
    246 
    -  link_old_mar_filenames:
    247 
    -    build_log: '-'
    248 
    -    debug: 0
    249 
    -    input_files: []
    250 
    -    link_old_mar_filenames: '[% INCLUDE link_old_mar_filenames %]'
    251 246 
       create_update_responses_tar:
    252 247 
         build_log: '-'
    253 248 
         debug: 0

  • projects/release/link_old_mar_filenames deleted
    1 
    -#!/bin/bash
    2 
    -[% c("var/set_default_env") -%]
    3 
    -# This script is for #40933:
    4 
    -#   Fix generating incrementals between 12.5.x and 13.0
    5 
    -[% FOREACH version = c("var/torbrowser_incremental_from") %]
    6 
    -  cd [% shell_quote(path(dest_dir)) %]/[% IF c("var/unsigned_releases_dir") %]un[% END %]signed/[% version %]
    7 
    -  test -e [% c("var/project-name") %]-linux-i686-[% version %]_ALL.mar || \
    8 
    -    ln -s [% c("var/project-name") %]-linux32-[% version %]_ALL.mar \
    9 
    -          [% c("var/project-name") %]-linux-i686-[% version %]_ALL.mar
    10 
    -  test -e [% c("var/project-name") %]-linux-x86_64-[% version %]_ALL.mar || \
    11 
    -    ln -s [% c("var/project-name") %]-linux64-[% version %]_ALL.mar \
    12 
    -          [% c("var/project-name") %]-linux-x86_64-[% version %]_ALL.mar
    13 
    -  test -e [% c("var/project-name") %]-windows-i686-[% version %]_ALL.mar || \
    14 
    -    ln -s [% c("var/project-name") %]-win32-[% version %]_ALL.mar \
    15 
    -          [% c("var/project-name") %]-windows-i686-[% version %]_ALL.mar
    16 
    -  test -e [% c("var/project-name") %]-windows-x86_64-[% version %]_ALL.mar || \
    17 
    -    ln -s [% c("var/project-name") %]-win64-[% version %]_ALL.mar \
    18 
    -          [% c("var/project-name") %]-windows-x86_64-[% version %]_ALL.mar
    19 
    -[% END -%]

  • rbm.conf
    ... ... @@ -81,12 +81,12 @@ buildconf:
    81 81 
       git_signtag_opt: '-s'
    82 82
    83 83 
     var:
    84 
    -  torbrowser_version: '13.0a6'
    84 
    +  torbrowser_version: '13.5a1'
    85 85 
       torbrowser_build: 'build1'
    86 86 
       torbrowser_incremental_from:
    87 
    -    - '13.0a3'
    88 87 
         - '13.0a4'
    89 88 
         - '13.0a5'
    89 
    +    - '13.0a6'
    90 90 
       updater_enabled: 1
    91 91 
       build_mar: 1
    92 92 
       mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]'

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

    _______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits