GitLab

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.

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.

 torbrowser-incrementals-release: submodule-update

 	$(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals --target torbrowser

 	tools/update-responses/download_missing_versions release

-	$(rbm) build release --step link_old_mar_filenames --target release --target torbrowser

 	tools/update-responses/gen_incrementals release

 	$(rbm) build release --step hash_incrementals --target release --target torbrowser

 torbrowser-incrementals-alpha: submodule-update

 	$(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals --target torbrowser

 	tools/update-responses/download_missing_versions alpha

-	$(rbm) build release --step link_old_mar_filenames --target alpha --target torbrowser

 	tools/update-responses/gen_incrementals alpha

 	$(rbm) build release --step hash_incrementals --target alpha --target torbrowser

 	$(rbm) build release --step update_responses_config --target release --target signed --target torbrowser

 	$(rbm) build release --step dmg2mar --target release --target signed --target torbrowser

 	tools/update-responses/download_missing_versions release

-	$(rbm) build release --step link_old_mar_filenames --target release --target torbrowser

 	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals release

 torbrowser-dmg2mar-alpha: submodule-update

 	$(rbm) build release --step update_responses_config --target alpha --target signed --target torbrowser

 	$(rbm) build release --step dmg2mar --target alpha --target signed --target torbrowser

 	tools/update-responses/download_missing_versions alpha

-	$(rbm) build release --step link_old_mar_filenames --target alpha --target torbrowser

 	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals alpha

 mullvadbrowser-incrementals-release: submodule-update

 	$(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals --target mullvadbrowser

 	tools/update-responses/download_missing_versions release

-	$(rbm) build release --step link_old_mar_filenames --target release --target mullvadbrowser

 	tools/update-responses/gen_incrementals release

 	$(rbm) build release --step hash_incrementals --target release --target mullvadbrowser

 mullvadbrowser-incrementals-alpha: submodule-update

 	$(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals --target mullvadbrowser

 	tools/update-responses/download_missing_versions alpha

-	$(rbm) build release --step link_old_mar_filenames --target alpha --target mullvadbrowser

 	tools/update-responses/gen_incrementals alpha

 	$(rbm) build release --step hash_incrementals --target alpha --target mullvadbrowser

 	$(rbm) build release --step update_responses_config --target release --target signed --target mullvadbrowser

 	$(rbm) build release --step dmg2mar --target release --target signed --target mullvadbrowser

 	tools/update-responses/download_missing_versions release

-	$(rbm) build release --step link_old_mar_filenames --target release --target mullvadbrowser

 	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals release

 mullvadbrowser-dmg2mar-alpha: submodule-update

 	$(rbm) build release --step update_responses_config --target alpha --target signed --target mullvadbrowser

 	$(rbm) build release --step dmg2mar --target alpha --target signed --target mullvadbrowser

 	tools/update-responses/download_missing_versions alpha

-	$(rbm) build release --step link_old_mar_filenames --target alpha --target mullvadbrowser

 	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals alpha

     name: ublock-origin

     sha256sum: e8ee3f9d597a6d42db9d73fe87c1d521de340755fd8bfdd69e41623edfe096d6

     enable: '[% c("var/mullvad-browser") %]'

-  - URL: https://github.com/mullvad/browser-extension/releases/download/v0.8.3-firefox-beta/mullvad-browser-extension-0.8.3.xpi

+  - URL: https://cdn.mullvad.net/browser-extension/0.8.4/mullvad-browser-extension-0.8.4.xpi

     name: mullvad-extension

-    sha256sum: e531ce6e809091eb40848874ea9e695bce61196397b6d8238ab582a152e02ac7

+    sha256sum: a0057a37482e178331cde7a6fd3c100315fcfc26e804aa37c9281f412d24cb79

     enable: '[% c("var/mullvad-browser") %]'

   - filename: 'gtk3-settings.ini'

     enable: '[% c("var/linux") %]'

 var:

   fenix_version: 115.2.1

-  browser_branch: 13.0-1

-  browser_build: 5

+  browser_branch: 13.5-1

+  browser_build: 1

   variant: Beta

   # This should be updated when the list of gradle dependencies is changed.

   gradle_dependencies_version: 1

   use_container: 1

 var:

-  firefox_platform_version: 115.3.0

+  firefox_platform_version: 115.4.0

   firefox_version: '[% c("var/firefox_platform_version") %]esr'

-  browser_series: '13.0'

+  browser_series: '13.5'

   browser_branch: '[% c("var/browser_series") %]-1'

-  browser_build: 3

+  browser_build: 1

   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") %]'

   use_container: 1

 var:

-  geckoview_version: 115.3.0esr

-  browser_branch: 13.0-1

-  browser_build: 3

+  geckoview_version: 115.4.0esr

+  browser_branch: 13.5-1

+  browser_build: 1

   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") %]'

     debug: 0

     input_files: []

     update_responses_config: '[% INCLUDE update_responses_config %]'

-  link_old_mar_filenames:

-    build_log: '-'

-    debug: 0

-    input_files: []

-    link_old_mar_filenames: '[% INCLUDE link_old_mar_filenames %]'

   create_update_responses_tar:

     build_log: '-'

     debug: 0

-#!/bin/bash

-[% c("var/set_default_env") -%]

-# This script is for #40933:

-#   Fix generating incrementals between 12.5.x and 13.0

-[% FOREACH version = c("var/torbrowser_incremental_from") %]

-  cd [% shell_quote(path(dest_dir)) %]/[% IF c("var/unsigned_releases_dir") %]un[% END %]signed/[% version %]

-  test -e [% c("var/project-name") %]-linux-i686-[% version %]_ALL.mar || \

-    ln -s [% c("var/project-name") %]-linux32-[% version %]_ALL.mar \

-          [% c("var/project-name") %]-linux-i686-[% version %]_ALL.mar

-  test -e [% c("var/project-name") %]-linux-x86_64-[% version %]_ALL.mar || \

-    ln -s [% c("var/project-name") %]-linux64-[% version %]_ALL.mar \

-          [% c("var/project-name") %]-linux-x86_64-[% version %]_ALL.mar

-  test -e [% c("var/project-name") %]-windows-i686-[% version %]_ALL.mar || \

-    ln -s [% c("var/project-name") %]-win32-[% version %]_ALL.mar \

-          [% c("var/project-name") %]-windows-i686-[% version %]_ALL.mar

-  test -e [% c("var/project-name") %]-windows-x86_64-[% version %]_ALL.mar || \

-    ln -s [% c("var/project-name") %]-win64-[% version %]_ALL.mar \

-          [% c("var/project-name") %]-windows-x86_64-[% version %]_ALL.mar

-[% END -%]
   git_signtag_opt: '-s'

 var:

-  torbrowser_version: '13.0a6'

+  torbrowser_version: '13.5a1'

   torbrowser_build: 'build1'

   torbrowser_incremental_from:

-    - '13.0a3'

     - '13.0a4'

     - '13.0a5'

+    - '13.0a6'

   updater_enabled: 1

   build_mar: 1

   mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]'

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

Commits:

8 changed files:

Changes: