- tor-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-147.0a1-16.0-2] fixup! BB 44045: Disable ML features.
by henry (＠henry) 29 Jan '26

29 Jan '26

henry pushed to branch tor-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: b73b3379 by Henry Wilkes at 2026-01-29T14:05:58+00:00 fixup! BB 44045: Disable ML features. TB 44554: Hide the GenAI menu item. - - - - - 2 changed files: - browser/base/content/main-popupset.inc.xhtml - browser/components/tabbrowser/content/tabbrowser.js Changes: ===================================== browser/base/content/main-popupset.inc.xhtml ===================================== @@ -62,8 +62,9 @@ <menuitem id="context_duplicateTab" data-lazy-l10n-id="duplicate-tab"/> <menuitem id="context_duplicateTabs" data-lazy-l10n-id="duplicate-tabs"/> <menuseparator/> - <menu id="context_askChat"/> - <menuseparator/> +  + <menu id="context_askChat" hidden="true"/> + <menuseparator hidden="true"/> <menuitem id="context_bookmarkSelectedTabs" hidden="true" data-lazy-l10n-id="bookmark-selected-tabs"/> ===================================== browser/components/tabbrowser/content/tabbrowser.js ===================================== @@ -9813,10 +9813,7 @@ var TabContextMenu = { !this.contextTab.pinned || !this.multiselected; // Build Ask Chat items - TabContextMenu.GenAI.buildTabMenu( - document.getElementById("context_askChat"), - this - ); + // GenAI is missing. tor-browser#44045. // Move Tab items let contextMoveTabOptions = document.getElementById( @@ -10289,6 +10286,6 @@ var TabContextMenu = { }; ChromeUtils.defineESModuleGetters(TabContextMenu, { - GenAI: "resource:///modules/GenAI.sys.mjs", + // GenAI.sys.mjs is missing. tor-browser#44045. TabNotes: "moz-src:///browser/components/tabnotes/TabNotes.sys.mjs", }); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/b73b337… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/b73b337… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] 2 commits: Bug 41706: Switch to cross-built zlib in linux cross-builds
by boklm (＠boklm) 29 Jan '26

29 Jan '26

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: a67eadb7 by NoisyCoil at 2026-01-29T11:57:14+01:00 Bug 41706: Switch to cross-built zlib in linux cross-builds - - - - - 4456f464 by NoisyCoil at 2026-01-29T11:57:16+01:00 Bug 41706: Bump glibc to v2.28 in the linux cross-toolchain Mozilla requires glibc >= 2.28 for linux-aarch64 builds. Bumping glibc to that version in our linux cross-toolchain allows us to drop all aarch64-specific patches. - - - - - 7 changed files: - projects/gcc-cross/build - projects/gcc-cross/config - − projects/gcc-cross/glibc-cross-linux-aarch64-2.patch - − projects/gcc-cross/glibc-cross-linux-aarch64.patch - projects/tor/build - projects/tor/config - projects/zlib/build Changes: ===================================== projects/gcc-cross/build ===================================== @@ -50,13 +50,6 @@ cd /var/tmp/build mkdir glibc cd glibc tar -xJf $rootdir/glibc-[% c("var/glibc_version") %].tar.xz -[% IF c("var/linux-aarch64") -%] - # Avoid linking issues by backporting glibc patches - cd glibc-[% c("var/glibc_version") %] - patch -p1 <$rootdir/glibc-cross-linux-aarch64.patch - patch -p1 <$rootdir/glibc-cross-linux-aarch64-2.patch - cd /var/tmp/build/glibc -[% END -%] # TODO: Remove --disable-werror once glibc is upgraded to a version that's # designed to work with the GCC version we're using. ===================================== projects/gcc-cross/config ===================================== @@ -10,6 +10,7 @@ hardened_gcc: 1 var: distdir: gcc deps: + - bison - build-essential - libmpc-dev setup: | @@ -19,8 +20,8 @@ var: export LD_LIBRARY_PATH=/var/tmp/dist/[% c("var/distdir") %]/lib64 [% IF c("hardened_gcc"); GET c("var/set_hardened_build_flags"); END %] configure_opt: '--target=[% c("var/crosstarget") %] --disable-multilib --enable-languages=c,c++ --with-glibc-version=[% c("var/glibc_version") %]' - # Use stretch's glibc and stretch-security's linux - glibc_version: 2.24 + # Use glibc 2.28 as per Mozilla's requirements for aarch64, and stretch-security's linux + glibc_version: 2.28 linux_version: 4.19.232 arch_deps: - gawk @@ -37,11 +38,7 @@ input_files: - name: gcc-native project: gcc - URL: 'https://ftp.gnu.org/gnu/glibc/glibc-[% c("var/glibc_version") %].tar.xz' - sha256sum: 99d4a3e8efd144d71488e478f62587578c0f4e1fa0b4eed47ee3d4975ebeb5d3 + sha256sum: b1900051afad76f7a4f73e71413df4826dce085ef8ddb785a945b66d7d513082 - URL: 'https://www.kernel.org/pub/linux/kernel/v4.x/linux-[% c("var/linux_version") %].tar.xz' sha256sum: 4fcfe814780d63dc56e907bf41596ff162e9601978bdc1a60eab64cc3903a22c - filename: 'gcc-cross.patch' - - filename: 'glibc-cross-linux-aarch64.patch' - enable: '[% c("var/linux-aarch64") -%]' - - filename: 'glibc-cross-linux-aarch64-2.patch' - enable: '[% c("var/linux-aarch64") -%]' ===================================== projects/gcc-cross/glibc-cross-linux-aarch64-2.patch deleted ===================================== @@ -1,30 +0,0 @@ -From e9177fba13549a8e2a6232f46080e5c6d3e467b1 Mon Sep 17 00:00:00 2001 -From: Szabolcs Nagy <szabolcs.nagy(a)arm.com> -Date: Wed, 21 Jun 2017 13:47:07 +0100 -Subject: [PATCH] [AArch64] Use hidden __GI__dl_argv in rtld startup code - -We rely on the symbol being locally defined so using extern symbol -is not correct and the linker may complain about the relocations. ---- - ChangeLog | 5 +++++ - sysdeps/aarch64/dl-machine.h | 4 ++-- - 2 files changed, 7 insertions(+), 2 deletions(-) - -Index: glibc/sysdeps/aarch64/dl-machine.h -=================================================================== ---- glibc.orig/sysdeps/aarch64/dl-machine.h -+++ glibc/sysdeps/aarch64/dl-machine.h -@@ -172,8 +172,8 @@ _dl_start_user: \n\ - cmp x0, #0 \n\ - bne 1b \n\ - // Update _dl_argv \n\ -- adrp x3, _dl_argv \n\ -- str x2, [x3, #:lo12:_dl_argv] \n\ -+ adrp x3, __GI__dl_argv \n\ -+ str x2, [x3, #:lo12:__GI__dl_argv] \n\ - .L_done_stack_adjust: \n\ - // compute envp \n\ - add x3, x2, x1, lsl #3 \n\ --- -2.43.2 - ===================================== projects/gcc-cross/glibc-cross-linux-aarch64.patch deleted ===================================== @@ -1,63 +0,0 @@ -From a68ba2f3cd3cbe32c1f31e13c20ed13487727b32 Mon Sep 17 00:00:00 2001 -From: Szabolcs Nagy <szabolcs.nagy(a)arm.com> -Date: Wed, 18 Oct 2017 17:26:23 +0100 -Subject: [PATCH] [AARCH64] Rewrite elf_machine_load_address using _DYNAMIC - symbol - -This patch rewrites aarch64 elf_machine_load_address to use special _DYNAMIC -symbol instead of _dl_start. - -The static address of _DYNAMIC symbol is stored in the first GOT entry. -Here is the change which makes this solution work (part of binutils 2.24): -https://sourceware.org/ml/binutils/2013-06/msg00248.html - -i386, x86_64 targets use the same method to do this as well. - -The original implementation relies on a trick that R_AARCH64_ABS32 relocation -being resolved at link time and the static address fits in the 32bits. -However, in LP64, normally, the address is defined to be 64 bit. - -Here is the C version one which should be portable in all cases. - - * sysdeps/aarch64/dl-machine.h (elf_machine_load_address): Use - _DYNAMIC symbol to calculate load address. ---- - ChangeLog | 5 +++++ - sysdeps/aarch64/dl-machine.h | 39 +++++------------------------------- - 2 files changed, 10 insertions(+), 34 deletions(-) - -Index: glibc-2.26/sysdeps/aarch64/dl-machine.h -=================================================================== ---- glibc-2.26.orig/sysdeps/aarch64/dl-machine.h -+++ glibc-2.26/sysdeps/aarch64/dl-machine.h -@@ -51,26 +51,11 @@ elf_machine_load_address (void) - /* To figure out the load address we use the definition that for any symbol: - dynamic_addr(symbol) = static_addr(symbol) + load_addr - -- The choice of symbol is arbitrary. The static address we obtain -- by constructing a non GOT reference to the symbol, the dynamic -- address of the symbol we compute using adrp/add to compute the -- symbol's address relative to the PC. -- This depends on 32bit relocations being resolved at link time -- and that the static address fits in the 32bits. */ -+ _DYNAMIC sysmbol is used here as its link-time address stored in -+ the special unrelocated first GOT entry. */ - -- ElfW(Addr) static_addr; -- ElfW(Addr) dynamic_addr; -- -- asm (" \n" --" adrp %1, _dl_start; \n" --" add %1, %1, #:lo12:_dl_start \n" --" ldr %w0, 1f \n" --" b 2f \n" --"1: \n" --" .word _dl_start \n" --"2: \n" -- : "=r" (static_addr), "=r" (dynamic_addr)); -- return dynamic_addr - static_addr; -+ extern ElfW(Dyn) _DYNAMIC[] attribute_hidden; -+ return (ElfW(Addr)) &_DYNAMIC - elf_machine_dynamic (); - } - - /* Set up the loaded object described by L so its unrelocated PLT ===================================== projects/tor/build ===================================== @@ -11,23 +11,9 @@ TORDOCSDIR="$distdir/docs" mkdir $TORDATADIR $TORBINDIR $TORDOCSDIR -[% IF c("var/windows") || c("var/android") %] +[% IF c("var/windows") || c("var/android") || c("var/linux-cross") %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/zlib') %] zlibdir=/var/tmp/dist/zlib -[% ELSIF c("var/linux-cross") %] - # Since 1. we are using Debian's zlib1g-dev:$arch_debian, 2. our - # cross-toolchain's default paths (i.e. -I and -L) are not the same - # as those of Debian's cross-toolchain, and 3. tor's configure does - # not support separate header and library directories for zlib, we - # need to make the headers and $arch_debian library available to - # configure manually. - # DO NOT use CPPFLAGS="-I/usr/include" to include the headers, the - # build will fail (probably because some of our cross-$arch_debian - # headers get masked by the native ones). - CROSS_INCLUDEDIR=/var/tmp/dist/gcc/[% c("var/crosstarget") %]/include - ln -s /usr/include/zconf.h $CROSS_INCLUDEDIR - ln -s /usr/include/zlib.h $CROSS_INCLUDEDIR - export LDFLAGS="-L/usr/lib/[% c("var/crosstarget") %] $LDFLAGS" [% END %] [% IF c("var/android") %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/zstd') %] @@ -74,7 +60,7 @@ echo '"[% c("abbrev", { abbrev_length => 16 }) %]"' > micro-revision.i find -type f -print0 | xargs -0 [% c("touch") %] ./configure --disable-asciidoc --with-libevent-dir="$libeventdir" --with-openssl-dir="$openssldir" \ [% IF c("var/asan") %]--enable-fragile-hardening[% END %] \ - [% IF c("var/windows") || c("var/android") %]--with-zlib-dir="$zlibdir"[% END %] \ + [% IF c("var/windows") || c("var/android") || c("var/linux-cross") %]--with-zlib-dir="$zlibdir"[% END %] \ [% IF c("var/macos") %]--enable-static-openssl[% END %] \ [% IF c("var/windows") %]--enable-static-libevent --enable-static-openssl --enable-static-zlib[% END %] \ [% IF c("var/linux-cross") %]--build=x86_64-linux-gnu[% END %] \ @@ -134,7 +120,7 @@ cd $distdir pushd $TORDOCSDIR cp $libeventdir/LICENSE libevent.txt cp $openssldir/LICENSE.txt openssl.txt -[% IF c("var/windows") || c("var/android") -%] +[% IF c("var/windows") || c("var/android") || c("var/linux-cross") -%] cp $zlibdir/LICENSE zlib.txt [% END -%] [% IF c("var/android") -%] ===================================== projects/tor/config ===================================== @@ -27,8 +27,6 @@ targets: linux-aarch64: var: libdir: lib64 - arch_deps: - - zlib1g-dev:arm64 android: var: @@ -42,7 +40,7 @@ input_files: project: libevent - name: zlib project: zlib - enable: '[% c("var/windows") || c("var/android") %]' + enable: '[% c("var/windows") || c("var/android") || c("var/linux-cross") %]' - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - name: zstd ===================================== projects/zlib/build ===================================== @@ -14,6 +14,10 @@ cd /var/tmp/build/[% project %]-[% c('version') %] [% IF c("var/android") -%] export CHOST=[% c("var/cross_prefix") %] export CC=[% c("var/CC") %] +[% ELSIF c("var/linux-cross") -%] + export CHOST=[% c("var/crosstarget") %] +[% END -%] +[% IF c("var/android") || c("var/linux-cross") -%] export CFLAGS="[% c('var/CFLAGS') %]" ./configure --prefix=$distdir make -j[% c("num_procs") %] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-15.0] Bug 41708: mkdir out/browser in relprep.py before downloading addons.
by Pier Angelo Vendrame (＠pierov) 29 Jan '26

29 Jan '26

Pier Angelo Vendrame pushed to branch maint-15.0 at The Tor Project / Applications / tor-browser-build Commits: 0c8bdf13 by Pier Angelo Vendrame at 2026-01-29T10:56:28+01:00 Bug 41708: mkdir out/browser in relprep.py before downloading addons. Otherwise, the download might fail if that directory does not exist yet. - - - - - 1 changed file: - tools/relprep.py Changes: ===================================== tools/relprep.py ===================================== @@ -396,7 +396,9 @@ class ReleasePreparation: logger.debug("No need to update the %s extension.", name) return input_["URL"] = url - path = self.base_path / "out/browser" / url.split("/")[-1] + path = self.base_path / "out/browser" + path.mkdir(parents=True, exist_ok=True) + path /= url.split("/")[-1] # The extension should be small enough to easily fit in memory :) if not path.exists(): r = requests.get(url) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41708: mkdir out/browser in relprep.py before downloading addons.
by Pier Angelo Vendrame (＠pierov) 29 Jan '26

29 Jan '26

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 3a9f91cb by Pier Angelo Vendrame at 2026-01-29T10:54:46+01:00 Bug 41708: mkdir out/browser in relprep.py before downloading addons. Otherwise, the download might fail if that directory does not exist yet. - - - - - 1 changed file: - tools/relprep.py Changes: ===================================== tools/relprep.py ===================================== @@ -395,7 +395,9 @@ class ReleasePreparation: logger.debug("No need to update the %s extension.", name) return input_["URL"] = url - path = self.base_path / "out/browser" / url.split("/")[-1] + path = self.base_path / "out/browser" + path.mkdir(parents=True, exist_ok=True) + path /= url.split("/")[-1] # The extension should be small enough to easily fit in memory :) if not path.exists(): r = requests.get(url) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/3… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41705: Remove unnecessary workaround in projects/go/build
by boklm (＠boklm) 29 Jan '26

29 Jan '26

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 9e702e7a by Nicolas Vigier at 2026-01-29T10:33:24+01:00 Bug 41705: Remove unnecessary workaround in projects/go/build A workaround for https://github.com/golang/go/issues/15457 was added a long time ago, but is not necessary anymore. - - - - - 1 changed file: - projects/go/build Changes: ===================================== projects/go/build ===================================== @@ -22,26 +22,12 @@ cd /var/tmp/dist/go/src [% IF c("var/linux") -%] ./make.bash [% ELSIF c("var/macos") -%] - unset LDFLAGS rm -Rf $clangdir/helpers - export CC="$clangdir/bin/clang [% c('var/FLAGS') %]" - # Create a cc-for-target script that closes over CC, CFLAGS, and LDFLAGS. - # Go's CC_FOR_TARGET only allows a command name, not a command with arguments. - # https://github.com/golang/go/issues/15457 - CC_FOR_TARGET="$(pwd)/cc-for-target" - echo "#!/bin/sh" > "$CC_FOR_TARGET" - echo "exec $CC \"\$@\"" >> "$CC_FOR_TARGET" - chmod +x "$CC_FOR_TARGET" - CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash + CGO_ENABLED=1 CC_FOR_TARGET="$clangdir/bin/clang [% c('var/FLAGS') %]" \ + CC= CFLAGS= LDFLAGS= ./make.bash [% ELSIF c("var/windows") -%] - # Create a cc-for-target script that closes over CC, CFLAGS, and LDFLAGS. - # Go's CC_FOR_TARGET only allows a command name, not a command with arguments. - # https://github.com/golang/go/issues/15457 - CC_FOR_TARGET="$(pwd)/cc-for-target" - echo "#!/bin/sh" > "$CC_FOR_TARGET" - echo "exec [% c("arch") %]-w64-mingw32-cc [% c("var/CFLAGS") %] [% c("var/LDFLAGS") %] \"\$@\"" >> "$CC_FOR_TARGET" - chmod +x "$CC_FOR_TARGET" - CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash + CC_FOR_TARGET='[% c("arch") %]-w64-mingw32-cc [% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]' \ + CGO_ENABLED=1 CC= CFLAGS= LDFLAGS= ./make.bash [% ELSIF c("var/android") -%] CGO_ENABLED=1 CC_FOR_TARGET=[% c("var/CC") %] CC= CFLAGS= LDFLAGS= ./make.bash [% END -%] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/9… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41707: Add a shebang to `fetch_locale` in firefox-l10n
by boklm (＠boklm) 29 Jan '26

29 Jan '26

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: f24c3c5a by NoisyCoil at 2026-01-29T00:05:14+01:00 Bug 41707: Add a shebang to `fetch_locale` in firefox-l10n - - - - - 1 changed file: - projects/firefox-l10n/config Changes: ===================================== projects/firefox-l10n/config ===================================== @@ -15,6 +15,7 @@ steps: filename: 'l10n-[% c("input_file_var/locale") %]-[% c("abbrev") %]-[% c("var/build_id") %].tar.xz' version: '[% c("git_hash") %]' fetch_locale: | + #!/bin/bash [% c("var/set_default_env") -%] tar xf '[% project %]-[% c("version") %].tar.[% c("compress_tar") %]' cd [% project %]-[% c("version") %] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-15.0.5-build1
by Pier Angelo Vendrame (＠pierov) 28 Jan '26

28 Jan '26

Pier Angelo Vendrame pushed new tag tbb-15.0.5-build1 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/tbb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-15.0] Bug 41694: Prepare Tor Browser 15.0.5
by Pier Angelo Vendrame (＠pierov) 28 Jan '26

28 Jan '26

Pier Angelo Vendrame pushed to branch maint-15.0 at The Tor Project / Applications / tor-browser-build Commits: 528e744e by Pier Angelo Vendrame at 2026-01-28T21:26:40+01:00 Bug 41694: Prepare Tor Browser 15.0.5 - - - - - 9 changed files: - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt - projects/browser/config - projects/firefox/config - projects/geckoview/config - projects/go/config - projects/openssl/config - projects/tor/config - projects/translation/config - rbm.conf Changes: ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -1,3 +1,16 @@ +Tor Browser 15.0.5 - January 29 2026 + * All Platforms + * Updated Tor to 0.4.8.22 + * Updated NoScript to 13.5.12.1984 + * Updated OpenSSL to 3.5.5 + * Android + * Bug 44533: Update NoScript to the version bundled with the browser on Android [tor-browser] + * Build System + * All Platforms + * Bug 41691: Update Lyrebird to v0.8.1 [tor-browser-build] + * Windows + Linux + Android + * Updated Go to 1.24.12 + Tor Browser 15.0.4 - January 13 2025 * All Platforms * Bug 44418: Update built-in obfs4 bridges [tor-browser] ===================================== projects/browser/config ===================================== @@ -114,12 +114,12 @@ input_files: - filename: dmg-root enable: '[% ! c("var/android") %]' - name: fenix-nightly-apk - URL: https://ftp.mozilla.org/pub/fenix/nightly/2026/01/2026-01-11-21-42-32-fenix… + URL: https://ftp.mozilla.org/pub/fenix/nightly/2026/01/2026-01-28-09-48-16-fenix… enable: '[% c("var/android") %]' - sha256sum: c39056d428bf573aa9df1d4be11493064f867bc247bda1e8b7e1836d5aae7a31 - - URL: https://dist.torproject.org/torbrowser/noscript/noscript-13.5.7.1984.xpi + sha256sum: e0d0a3f6ad75fe8685f6b537b3cf2f8724e759dc19d7ba5fd1f01768d92a4c9c + - URL: https://dist.torproject.org/torbrowser/noscript/noscript-13.5.12.1984.xpi name: noscript - sha256sum: 502cba045cc36f813adce8931e13d7f8f3962f8ba855173f4ba19bc82a6cfb59 + sha256sum: 6643afdd4b7363c685a3666307ad32330118942c4dd5929c61a53f694778e8cd - URL: https://addons.mozilla.org/firefox/downloads/file/4629131/ublock_origin-1.6… name: ublock-origin sha256sum: 5caf4abda494018841222a12156919bbdd8cad82a783c38c36b22dd642704315 ===================================== projects/firefox/config ===================================== @@ -21,7 +21,7 @@ var: browser_series: '15.0' browser_rebase: 1 browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]' - browser_build: 2 + browser_build: 3 copyright_year: '[% exec("git show -s --format=%ci " _ c("git_hash") _ "^{commit}", { exec_noco => 1 }).remove("-.*") %]' nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]' gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser ===================================== projects/geckoview/config ===================================== @@ -23,7 +23,7 @@ var: browser_series: '15.0' browser_rebase: 1 browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]' - browser_build: 2 + browser_build: 3 gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser git_commit: '[% exec("git rev-parse " _ c("git_hash") _ "^{commit}", { exec_noco => 1 }) %]' deps: ===================================== projects/go/config ===================================== @@ -1,11 +1,11 @@ # vim: filetype=yaml sw=2 -version: '1.24.11' +version: '1.24.12' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' container: use_container: 1 var: - source_sha256: ffdf97766a4c4b135cd53809713978e9ee1a943b2c8e28ad221a5429de30e210 + source_sha256: fba2dd661b7be7b34d6bd17ed92f41c44a5e05953ad81ab34b4ec780e5e7dc41 no_crosscompile: 1 setup: | mkdir -p /var/tmp/dist ===================================== projects/openssl/config ===================================== @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 3.5.4 +version: 3.5.5 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' container: use_container: 1 @@ -20,7 +20,7 @@ targets: windows: var: flag_mwindows: '' - configure_opts: '-shared --cross-compile-prefix=[% c("arch") %]-w64-mingw32- mingw[% IF c("var/windows-x86_64") %]64[% END %] "[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]"' + configure_opts: '-shared --cross-compile-prefix=[% c("arch") %]-w64-mingw32- mingw[% IF c("var/windows-x86_64") %]64[% END %] "[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]" no-quic' macos: var: configure_opts: '--cross-compile-prefix=[% c("var/build_target") %]- darwin64-[% c("var/macos_arch") %]-cc enable-ec_nistp_64_gcc_128' @@ -33,5 +33,5 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://github.com/openssl/openssl/releases/download/openssl-[% c("version") %]/openssl-[% c("version") %].tar.gz' - sha256sum: 967311f84955316969bdb1d8d4b983718ef42338639c621ec4c34fddef355e99 + sha256sum: b28c91532a8b65a1f983b4c28b7488174e4a01008e29ce8e69bd789f28bc2a89 name: openssl ===================================== projects/tor/config ===================================== @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' -version: 0.4.8.21 +version: 0.4.8.22 git_hash: 'tor-[% c("version") %]' git_url: https://gitlab.torproject.org/tpo/core/tor.git git_submodule: 1 ===================================== projects/translation/config ===================================== @@ -12,13 +12,13 @@ compress_tar: 'gz' steps: base-browser: base-browser: '[% INCLUDE build %]' - git_hash: fca1605a06b1a9b24cac7de6afb23aa896864e3e + git_hash: dde7588c28c82d4dd7dbd67b63eca130133f0f44 targets: nightly: git_hash: 'base-browser' tor-browser: tor-browser: '[% INCLUDE build %]' - git_hash: 579dafc751edf73f98da66e548b87d85474104ea + git_hash: 80a21604c7449a88542746738757a12f088b7f24 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: 7263bfcfc42102962e304ec8ea415b3b210411b8 + git_hash: 3978cf005c3b7228d222db60811e9a797418f68b compress_tar: 'zst' targets: nightly: ===================================== rbm.conf ===================================== @@ -74,11 +74,11 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '15.0.4' + torbrowser_version: '15.0.5' 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: '2026/01/12 12:13:57' + browser_release_date: '2026/01/28 20:00:00' browser_release_date_timestamp: '[% USE date; date.format(c("var/browser_release_date"), "%s") %]' browser_default_channel: release browser_platforms: @@ -128,9 +128,9 @@ var: updater_enabled: 1 build_mar: 1 torbrowser_incremental_from: + - 15.0.4 - 15.0.3 - 15.0.2 - - 15.0.1 mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' torbrowser_legacy_version: 13.5.27 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-140.7.0esr-15.0-1-build3
by Pier Angelo Vendrame (＠pierov) 28 Jan '26

28 Jan '26

Pier Angelo Vendrame pushed new tag tor-browser-140.7.0esr-15.0-1-build3 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-147.0a1-16.0-2] 2 commits: fixup! BB 43615: Add Gitlab Issue and Merge Request templates
by brizental (＠brizental) 28 Jan '26

28 Jan '26

brizental pushed to branch tor-browser-147.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 0a86acd8 by Beatriz Rizental at 2026-01-28T15:26:23+00:00 fixup! BB 43615: Add Gitlab Issue and Merge Request templates Delete Rebase templates from Base Browser - - - - - 4ccf290c by Beatriz Rizental at 2026-01-28T15:26:23+00:00 fixup! TB 43616: Customize Gitlab Issue and Merge Request templates Update rebase templates - - - - - 5 changed files: - .gitlab/issue_templates/060 Rebase - Alpha.md - .gitlab/issue_templates/061 Rebase - Stable.md - − .gitlab/issue_templates/062 Rebase - Legacy.md - − .gitlab/issue_templates/063 Rebase - Rapid.md - .gitlab/issue_templates/Default.md Changes: ===================================== .gitlab/issue_templates/060 Rebase - Alpha.md ===================================== @@ -1,155 +1,100 @@ # ⤵️ Rebase Alpha -**NOTE:** All examples in this template reference the rebase from 102.7.0esr to 102.8.0esr - -<details> - <summary>Explanation of Variables</summary> - -- `$(ESR_VERSION)`: the Mozilla defined ESR version, used in various places for building tor-browser tags, labels, etc - - **Example**: `102.8.0` -- `$(ESR_TAG)`: the Mozilla defined hg (Mercurial) tag associated with `$(ESR_VERSION)` - - **Example**: `FIREFOX_102_8_0esr_RELEASE` -- `$(ESR_TAG_PREV)`: the Mozilla defined hg (Mercurial) tag associated with the previous ESR version when rebasing (ie, the ESR version we are rebasing from) - - **Example**: `FIREFOX_102_7_0esr_BUILD1` -- `$(BROWSER_MAJOR)`: the browser major version - - **Example**: `12` -- `$(BROWSER_MINOR)`: the browser minor version - - **Example**: either `0` or `5`; Alpha's is always `(Stable + 5) % 10` -- `$(BASE_BROWSER_BRANCH)`: the full name of the current `base-browser` branch - - **Example**: `base-browser-102.8.0esr-12.5-1` -- `$(BASE_BROWSER_BRANCH_PREV)`: the full name of the previous `base-browser` branch - - **Example**: `base-browser-102.7.0esr-12.5-1` -- `$(TOR_BROWSER_BRANCH)`: the full name of the current `tor-browser` branch - - **Example**: `tor-browser-102.8.0esr-12.5-1` -- `$(TOR_BROWSER_BRANCH_PREV)`: the full name of the previous `tor-browser` branch - - **Example**: `tor-browser-102.7.0esr-12.5-1` -</details> - -**NOTE:** It is assumed that we've already identified the new ESR branch during the tor-browser stable rebase - -### **Bookkeeping** +## **Bookkeeping** - [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issue. - [ ] Create "Firefox Release Review" issue for this version - **NOTE**: We have issues open through Firefox 153 so this can be skipped until we get to Firefox 154 -### **Update Branch Protection Rules** - -- [ ] In [Repository Settings](https://gitlab.torproject.org/tpo/applications/tor-browser/-/sett…: - - [ ] Remove previous alpha `base-browser` and `tor-browser` branch protection rules (this will prevent pushing new changes to the branches being rebased) - - [ ] Create new `base-browser` and `tor-browser` branch protection rule: - - **Branch**: `(tor|base)-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1*` - - **Example**: `(tor|base)-browser-102.8.0esr-12.5-1*` - - **Allowed to merge**: `Maintainers` - - **Allowed to push and merge**: `Maintainers` - - **Allowed to force push**: `false` - - If you copied and pasted from old rules, double check you didn't add spaces at the end, as GitLab will not trim them! - -### **Create New Branches** - -- [ ] Fetch Mozilla's firefox repo and identify this release's ${ESR_TAG} -- [ ] Create new alpha `base-browser` branch from Firefox ${ESR_TAG} - - Branch name in the form: `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1` - - **Example**: `base-browser-102.8.0esr-12.5-1` -- [ ] Create new alpha `tor-browser` branch from Firefox mercurial tag - - Branch name in the form: `tor-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1` - - **Example**: `tor-browser-102.8.0esr-12.5-1` -- [ ] Push new `base-browser` branch to `upstream` -- [ ] Push new `tor-browser` branch to `upstream` - -### **Rebase tor-browser** - -- [ ] Checkout a new local branch for the `tor-browser` rebase - - **Example**: `git branch tor-browser-rebase FIREFOX_102_8_0esr_BUILD1` -- [ ] **(Optional)** `base-browser` rebase and autosquash - - **NOTE** This step may be skipped if the `HEAD` of the previous `base-browser` branch is a `-buildN` tag - - [ ] Cherry-pick the previous `base-browser` commits up to `base-browser`'s `buildN` tag onto new `base-browser` rebase branch - - **Example**: `git cherry-pick FIREFOX_102_7_0esr_BUILD1..base-browser-102.7.0esr-12.5-1-build1` - - [ ] Rebase and autosquash these cherry-picked commits - - **Example**: `git rebase --autosquash --interactive FIREFOX_102_8_0esr_BUILD1 HEAD` - - [ ] Cherry-pick remainder of patches after the `buildN` tag - - **Example**: `git cherry-pick base-browser-102.7.0esr-12.5-1-build1..upstream/base-browser-102.7.0esr-12.5-1` - -- [ ] `tor-browser` rebase and autosquash - - [ ] Note the current git hash of `HEAD` for `tor-browser` rebase+autosquash step: `git rev-parse HEAD` - - [ ] Cherry-pick the appropriate previous `tor-browser` branch's commit range up to the last `tor-browser` `buildN` tag - - **Example**: `git cherry-pick base-browser-102.7.0esr-12.5-1-build1..tor-browser-102.7.0esr-12.5-1-build1` - - **Example (if separate base-browser rebase was skipped)**: `git cherry-pick FIREFOX_102_7_0esr_BUILD1..tor-browser-102.7.0esr-12.5-1-build1` - - [ ] Rebase and autosquash **ONLY** these newly cherry-picked commits using the commit noted previously: `git rebase --autosquash --interactive $(PREV_HEAD)` - - **Example**: `git rebase --autosquash --interactive FIREFOX_102_8_0esr_RELEASE` - - [ ] **(Optional)** Patch reordering - - **NOTE**: We typically want to do this after new features or bug fix commits which are not !fixups to an existing commit have been merged and are just sitting at the end of the commit history - - Relocate new `base-browser` patches in the patch-set to enforce this rough thematic ordering: - - **MOZILLA BACKPORTS** - official Firefox patches we have backported to our ESR branch: Android-specific security updates, critical bug fixes, worthwhile features, etc - - **MOZILLA REVERTS** - revert commits of official Firefox patches - - **UPLIFT CANDIDATES** - patches which stand on their own and should be uplifted to `mozilla-central` - - **BUILD CONFIGURATION** - tools/scripts, gitlab templates, etc - - **BROWSER CONFIGURATION** - branding, mozconfigs, preference overrides, etc - - **SECURITY PATCHES** - security improvements, hardening, etc - - **PRIVACY PATCHES** - fingerprinting, linkability, proxy bypass, etc - - **FEATURES** - new functionality: updater, UX, letterboxing, security level, add-on - - Relocate new `tor-browser` patches in the patch-set to enforce this rough thematic ordering: - - **BUILD CONFIGURATION** - tools/scripts, gitlab templates, etc - - **BROWSER CONFIGURATION** - branding, mozconfigs, preference overrides, etc - - **UPDATER PATCHES** - updater tweaks, signing keys, etc - - **SECURITY PATCHES** - non tor-dependent security improvements, hardening, etc - - **PRIVACY PATCHES** - non tor-dependent fingerprinting, linkability, proxy bypass, etc - - **FEAURES** - non tor-dependent features - - **TOR INTEGRATION** - legacy tor-launcher/torbutton, tor modules, bootstrapping, etc - - **TOR SECURITY PATCHES** - tor-specific security improvements - - **TOR PRIVACY PATCHES** - tor-specific privacy improvements - - **TOR FEATURES** - new tor-specific functionality: manual, onion-location, onion service client auth, etc - - [ ] Cherry-pick remainder of patches after the last `tor-browser` `buildN` tag - - **Example**: `git cherry-pick tor-browser-102.7.0esr-12.5-1-build1..upstream/tor-browser-102.7.0esr-12.5-1` - - [ ] Rebase and `pick` new security backport patches to the end of the **MOZILLA BACKPORTS** section of the commit history - - **Example**: `git rebase --interactive FIREFOX_102_8_0esr_RELEASE` - - [ ] Rebase and autosquash again, this time replacing all `fixup` and `squash` commands with `pick`. The goal here is to have all of the `fixup` and `squash` commits beside the commit which they modify, but kept un-squashed for easy debugging/bisecting. - - **Example**: `git rebase --autosquash --interactive FIREFOX_102_8_0esr_RELEASE` -- [ ] Compare patch sets to ensure nothing *weird* happened during conflict resolution: - - [ ] diff of diffs: - - Do the diff between `current_patchset.diff` and `rebased_patchset.diff` with your preferred difftool and look at differences on lines that starts with + or - - - `git diff $(ESR_TAG_PREV)..$(BROWSER_BRANCH_PREV) > current_patchset.diff` - - `git diff $(ESR_TAG)..$(BROWSER_BRANCH) > rebased_patchset.diff` - - diff `current_patchset.diff` and `rebased_patchset.diff` - - If everything went correctly, the only lines which should differ should be the lines starting with `index abc123...def456` (unless the previous `base-browser` branch includes changes not included in the previous `tor-browser` branch) - - [ ] rangediff: `git range-diff $(ESR_TAG_PREV)..$(TOR_BROWSER_BRANCH_PREV) $(ESR_TAG)..HEAD` - - **Example**: `git range-dif FIREFOX_102_7_0esr_BUILD1..upstream/tor-browser-102.7.0esr-12.5-1 FIREFOX_102_8_0esr_BUILD1..HEAD` -- [ ] Open MR for the `tor-browser` rebase -- [ ] Merge -- Update and push `base-browser` branch - - [ ] Reset the new `base-browser` branch to the appropriate commit in this new `tor-browser` branch - - [ ] Push these commits to `upstream` -- [ ] Set `$(TOR_BROWSER_BRANCH)` as the default GitLab branch - - [ ] Go to [Repository Settings](https://gitlab.torproject.org/tpo/applications/tor-browser/-/sett… - - [ ] Expand `Branch defaults` - - [ ] Set the branch and leave the `Auto-close` checkbox unchecked - - [ ] Save changes - -### **Sign and Tag** - -- [ ] Sign/Tag `HEAD` of the merged `tor-browser` branch: - - In **tor-browser.git**, checkout the new alpha `tor-browser` branch - - In **tor-browser-build.git**, run signing script: - ```bash - ./tools/browser/sign-tag.torbrowser alpha build1 - ``` - - [ ] Push tag to `upstream` -- [ ] Sign/Tag HEAD of the merged `base-browser` branch: - - In **tor-browser.git**, checkout the new alpha `base-browser` branch - - In **tor-browser-build.git**, run signing script: - ```bash - ./tools/browser/sign-tag.basebrowser alpha build1 - ``` - - [ ] Push tag to `upstream` -- [ ] Update tor-browser-build's `main` branch (no MR required, you can just push it if you have the permissions) - - [ ] Update `projects/firefox/config` - - [ ] Update `firefox_platform_version` - - [ ] Set `browser_build` to 1 (to prevent failures in alpha testbuilds) - - [ ] Update `projects/geckoview/config` - - [ ] Update `firefox_platform_version` - - [ ] Set `browser_build` to 1 (to prevent failures in alpha testbuilds) - - +## **Rebase** + +The step-by-step rebase process is detailed on the [Rebase Process](https://gitlab.torproject.org/tpo/applications/wiki/-/wikis/Develo… wiki page. Refer to it for detailed instructions on how to perform each step. + +- Rebase application-services + - uniffi-rs + - Prepare the rebase + - [ ] Verify if application-services has updated it's uniffi-rs version + - [ ] Get the [upstream](https://github.com/mozilla/uniffi-rs) tag + - [ ] Freeze the current default branch + - [ ] Create the target branch (`X.XX.X`) + - [ ] Rebase + - Merge + - [ ] Perform a self-review + - [ ] Build + - [ ] File a merge request + - Tag and update the repository + - [ ] Tag `vX.XX.X` + - [ ] Make `X.XX.X` the default branch + - application-services + - Prepare the rebase + - [ ] Get the [upstream](github.com/mozilla/application-services) tag + - [ ] Freeze the current default branch + - [ ] Create the target branch (`XXX.X-TORBROWSER`) + - Do the rebase + - [ ] Cherry-pick commits + - [ ] Squash _all_ `fixup!` commits + - Merge + - [ ] Perform a self-review + - [ ] Build + - [ ] File a merge request + - [ ] Tag and update the repository + - [ ] Tag `vXXX.X-TORBROWSER-build1` + - [ ] Make `XXX.X-TORBROWSER` the default branch + +- Rebase Tor Browser + - Prepare the rebase + - [ ] Get the [Firefox](https://github.com/mozilla-firefox/firefox) tag + - Do the rebase [Part 1] + - [ ] Create the target branch (`tor-browser-...-1`) + - [ ] Cherry-pick commits until `tor-browser-...-build1` + - [ ] Freeze the current default branch + - [ ] Cherry-pick remaining commits + - Merge + - [ ] Perform a self-review (`git range-diff`) + - [ ] Run linters + - [ ] Build and test + - [ ] Desktop + - [ ] Android + - [ ] File a merge request + - Tag and update the repository + - [ ] Tag `tor-browser-...-1-build1` + - [ ] Tag `tor-browser-...-1-build2` + - [ ] Make `tor-browser-...-1` the default branch and freeze it + - Do the rebase [Part 2] + - [ ] Create the target branch (`tor-browser-...-2`) + - [ ] Cherry-pick commits until `tor-browser-...-1-build1` + - [ ] Squash (`git rebase --autosquash FIREFOX_...`) + - [ ] Cherry-pick the remaining commits + - [ ] Reorder commits + - Merge + - [ ] Perform a self-review (`git range-diff` + diff of diffs) + - [ ] Run linters + - [ ] Build and test + - [ ] Desktop + - [ ] Android + - [ ] File a merge request + - Tag and update the repository + - [ ] `tor-browser-...-2-build1` + - [ ] `base-browser-...-2-build1` + - [ ] Make `tor-browser-...-2` the default branch + +- Rebase Mullvad Browser + - Prepare the rebase + - [ ] Push the `base-browser-*` tag + - [ ] Freeze the current default branch + - [ ] Create the target branch (`mullvad-browser-...-1`) + - Do the rebase + - [ ] Cherry-pick commits until `mullvad-browser-...-build1` + - [ ] Squash (`git rebase --autosquash base-browser-...-build1`) + - [ ] Cherry-pick the remaining commits + - [ ] Reorder commits + - Merge + - [ ] Perform a self-review (`git range-diff` + diff of diffs) + - [ ] Run linters + - [ ] File a merge request + - [ ] Tag and update the repository + - [ ] Tag `mullvad-browser-...-build1` + - [ ] Make `mullvad-browser-...-2` the default branch --- ===================================== .gitlab/issue_templates/061 Rebase - Stable.md ===================================== @@ -1,116 +1,43 @@ # ⤵️ Rebase Stable -**NOTE:** All examples in this template reference the rebase from 102.7.0esr to 102.8.0esr - -<details> - <summary>Explanation of Variables</summary> - -- `$(ESR_VERSION)`: the Mozilla defined ESR version, used in various places for building tor-browser tags, labels, etc - - **Example**: `102.8.0` -- `$(ESR_TAG)`: the Mozilla defined hg (Mercurial) tag associated with `$(ESR_VERSION)` - - **Example**: `FIREFOX_102_8_0esr_RELEASE` -- `$(ESR_TAG_PREV)`: the Mozilla defined hg (Mercurial) tag associated with the previous ESR version when rebasing (ie, the ESR version we are rebasing from) - - **Example**: `FIREFOX_102_7_0esr_BUILD1` -- `$(BROWSER_MAJOR)`: the browser major version - - **Example**: `12` -- `$(BROWSER_MINOR)`: the browser minor version - - **Example**: either `0` or `5`; Alpha's is always `(Stable + 5) % 10` -- `$(BASE_BROWSER_BRANCH)`: the full name of the current `base-browser` branch - - **Example**: `base-browser-102.8.0esr-12.0-1` -- `$(BASE_BROWSER_BRANCH_PREV)`: the full name of the previous `base-browser` branch - - **Example**: `base-browser-102.7.0esr-12.0-1` -- `$(TOR_BROWSER_BRANCH)`: the full name of the current `tor-browser` branch - - **Example**: `tor-browser-102.8.0esr-12.0-1` -- `$(TOR_BROWSER_BRANCH_PREV)`: the full name of the previous `tor-browser` branch - - **Example**: `tor-browser-102.7.0esr-12.0-1` -</details> - -### **Bookkeeping** +## **Bookkeeping** - [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issue. -### Update Branch Protection Rules - -- [ ] In [Repository Settings](https://gitlab.torproject.org/tpo/applications/tor-browser/-/sett…: - - [ ] Remove previous stable `base-browser` and `tor-browser` branch protection rules (this will prevent pushing new changes to the branches being rebased) - - [ ] Create new `base-browser` and `tor-browser` branch protection rule: - - **Branch**: `(tor|base)-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1*` - - **Example**: `(tor|base)-browser-102.8.0esr-12.0-1*` - - **Allowed to merge**: `Maintainers` - - **Allowed to push and merge**: `Maintainers` - - **Allowed to force push**: `false` - -### **Identify the Firefox Tagged Commit and Create New Branches** - -- [ ] Fetch Mozilla's firefox repo and identify this release's ${ESR_TAG} -- [ ] Create new stable `base-browser` branch from tag - - Branch name in the form: `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1` - - **Example**: `base-browser-102.8.0esr-12.0-1` -- [ ] Create new stable `tor-browser` branch from - - Branch name in the form: `tor-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1` - - **Example**: `tor-browser-102.8.0esr-12.0-1` -- [ ] Push new `base-browser` branch to `upstream` -- [ ] Push new `tor-browser` branch to `upstream` -- [ ] Push new `$(ESR_TAG)` to `upstream` - -### **Rebase tor-browser** - -- [ ] Checkout a new local branch for the `tor-browser` rebase - - **Example**: `git branch tor-browser-rebase FIREFOX_102_8_0esr_BUILD1` -- [ ] **(Optional)** `base-browser` rebase - - **NOTE** This step may be skipped if the `HEAD` of the previous `base-browser` branch is a `-buildN` tag - - [ ] Cherry-pick the previous `base-browser` commits up to `base-browser`'s `buildN` tag onto new `base-browser` rebase branch - - **Example**: `git cherry-pick FIREFOX_102_7_0esr_BUILD1..base-browser-102.7.0esr-12.0-1-build1` - - [ ] Rebase and autosquash these cherry-picked commits - - **Example**: `git rebase --autosquash --interactive FIREFOX_102_8_0esr_BUILD1 HEAD` - - [ ] Cherry-pick remainder of patches after the `buildN` tag - - **Example**: `git cherry-pick base-browser-102.7.0esr-12.0-1-build1..upstream/base-browser-102.7.0esr-12.0-1` -- [ ] `tor-browser` rebase - - [ ] Note the current git hash of `HEAD` for `tor-browser` rebase+autosquash step: `git rev-parse HEAD` - - [ ] Cherry-pick the appropriate previous `tor-browser` branch's commit range up to the last `tor-browser` `buildN` tag - - **Example**: `git cherry-pick base-browser-102.7.0esr-12.0-1-build1..tor-browser-102.7.0esr-12.0-1-build1` - - **Example (if separate base-browser rebase was skipped)**: `git cherry-pick FIREFOX_102_7_0esr_BUILD1..tor-browser-102.7.0esr-12.0-1-build1` - - [ ] Rebase and autosquash these newly cherry-picked commits: `git rebase --autosquash --interactive $(PREV_HEAD)` - - **Example**: `git rebase --autosquash --interactive FIREFOX_102_8_0esr_RELEASE` - - [ ] Cherry-pick remainder of patches after the last `tor-browser` `buildN` tag - - **Example**: `git cherry-pick tor-browser-102.7.0esr-12.0-1-build1..upstream/tor-browser-102.7.0esr-12.0-1` - - [ ] Rebase and `pick` new security backport patches to the end of the **MOZILLA BACKPORTS** section of the commit history - - **Example**: `git rebase --interactive FIREFOX_102_8_0esr_RELEASE` - - [ ] Rebase and autosquash again, this time replacing all `fixup` and `squash` commands with `pick`. The goal here is to have all of the `fixup` and `squash` commits beside the commit which they modify, but kept un-squashed for easy debugging/bisecting. - - **Example**: `git rebase --autosquash --interactive FIREFOX_102_8_0esr_RELEASE` -- [ ] Compare patch sets to ensure nothing *weird* happened during conflict resolution: - - [ ] diff of diffs: - - Do the diff between `current_patchset.diff` and `rebased_patchset.diff` with your preferred difftool and look at differences on lines that starts with + or - - - `git diff $(ESR_TAG_PREV)..$(BROWSER_BRANCH_PREV) > current_patchset.diff` - - `git diff $(ESR_TAG)..$(BROWSER_BRANCH) > rebased_patchset.diff` - - diff `current_patchset.diff` and `rebased_patchset.diff` - - If everything went correctly, the only lines which should differ should be the lines starting with `index abc123...def456` (unless the previous `base-browser` branch includes changes not included in the previous `tor-browser` branch) - - [ ] rangediff: `git range-diff $(ESR_TAG_PREV)..$(TOR_BROWSER_BRANCH_PREV) $(ESR_TAG)..HEAD` - - **Example**: `git range-dif FIREFOX_102_7_0esr_BUILD1..upstream/tor-browser-102.7.0esr-12.0-1 FIREFOX_102_8_0esr_BUILD1..HEAD` -- [ ] Open MR for the `tor-browser` rebase -- [ ] Merge -- Update and push `base-browser` branch - - [ ] Reset the new `base-browser` branch to the appropriate commit in this new `tor-browser` branch - - [ ] Push these commits to `upstream` - -### **Sign and Tag** - -- [ ] Sign/Tag `HEAD` of the merged `tor-browser` branch: - - In **tor-browser.git**, checkout the new stable `tor-browser` branch - - In **tor-browser-build.git**, run signing script: - ```bash - ./tools/browser/sign-tag.torbrowser stable build1 - ``` - - [ ] Push tag to `upstream` -- [ ] Sign/Tag HEAD of the merged `base-browser` branch: - - In **tor-browser.git**, checkout the new stable `base-browser` branch - - In **tor-browser-build.git**, run signing script: - ```bash - ./tools/browser/sign-tag.basebrowser stable build1 - ``` - - [ ] Push tag to `upstream` - - +## **Rebase** + +The step-by-step rebase process is detailed on the [Rebase Process](https://gitlab.torproject.org/tpo/applications/wiki/-/wikis/Develo… wiki page. Refer to it for detailed instructions on how to perform each step. + +- Rebase Tor Browser + - Prepare the rebase + - [ ] Get the Firefox tag + - [ ] Freeze the current default branch + - [ ] Create the target branch + - Do the rebase + - [ ] Cherry-pick commits until `tor-browser-...-build1` + - [ ] Squash (`git rebase --autosquash FIREFOX_...-build1`) + - [ ] Cherry-pick the remaining commits + - [ ] Reorder commits + - Merge + - [ ] Perform a self-review (`git range-diff` + diff of diffs) + - [ ] Run linters + - Tag + - [ ] `tor-browser-...-build1` + - [ ] `base-browser-...-build1` + +- Rebase Mullvad Browser + - Prepare the rebase + - [ ] Push the `base-browser-*` tag + - Do the rebase + - [ ] Cherry-pick commits until `mullvad-browser-...-build1` + - [ ] Squash (`git rebase --autosquash base-browser-...-build1`) + - [ ] Cherry-pick the remaining commits + - [ ] Reorder commits + - Merge + - [ ] Perform a self-review (`git range-diff` + diff of diffs) + - [ ] Run linters + - Tag + - [ ] `mullvad-browser-...-build1` --- ===================================== .gitlab/issue_templates/062 Rebase - Legacy.md deleted ===================================== @@ -1,93 +0,0 @@ -# ⤵️ Rebase Legacy - -**NOTE:** All examples in this template reference the rebase from 115.17.0esr to 115.18.0esr - -<details> - <summary>Explanation of Variables</summary> - -- `$(ESR_VERSION)`: the Mozilla defined ESR version, used in various places for building tor-browser tags, labels, etc - - **Example**: `115.18.0` -- `$(ESR_TAG)`: the Mozilla defined hg (Mercurial) tag associated with `$(ESR_VERSION)` - - **Example**: `FIREFOX_115_18_0esr_BUILD1` -- `$(ESR_TAG_PREV)`: the Mozilla defined hg (Mercurial) tag associated with the previous ESR version when rebasing (ie, the ESR version we are rebasing from) - - **Example**: `FIREFOX_115_17_0esr_BUILD1` -- `$(BASE_BROWSER_BRANCH)`: the full name of the current `base-browser` branch - - **Example**: `base-browser-115.18.0esr-13.5-1` -- `$(BASE_BROWSER_BRANCH_PREV)`: the full name of the previous `base-browser` branch - - **Example**: `base-browser-115.17.0esr-13.5-1` -- `$(TOR_BROWSER_BRANCH)`: the full name of the current `tor-browser` branch - - **Example**: `tor-browser-115.18.0esr-13.5-1` -- `$(TOR_BROWSER_BRANCH_PREV)`: the full name of the previous `tor-browser` branch - - **Example**: `tor-browser-115.17.0esr-13.5-1` -</details> - -### **Bookkeeping** - -- [ ] Link this issue to the appropriate [Release Prep](https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/is… issue. - -### Update Branch Protection Rules - -- [ ] In [Repository Settings](https://gitlab.torproject.org/tpo/applications/tor-browser/-/sett…: - - [ ] Remove previous legacy `base-browser` and `tor-browser` branch protection rules (this will prevent pushing new changes to the branches being rebased) - - [ ] Create new `tor-browser` branch protection rule: - - **Branch**: `tor-browser-$(ESR_VERSION)esr-13.5-1*` - - **Example**: `tor-browser-115.18.0esr-13.5-1*` - - **Allowed to merge**: `Maintainers` - - **Allowed to push and merge**: `Maintainers` - - **Allowed to force push**: `false` - -### **Identify the Firefox Tagged Commit and Create New Branches** - -- [ ] Fetch Mozilla's firefox repo and identify this release's ESR-115 ${ESR_TAG} -- [ ] Create new legacy `tor-browser` branch from - - Branch name in the form: `tor-browser-$(ESR_VERSION)esr-13.5-1` - - **Example**: `tor-browser-115.18.0esr-13.5-1` -- [ ] Push new `tor-browser` branch to `upstream` -- [ ] Push new `$(ESR_TAG)` to `upstream` - -### **Rebase tor-browser** - -- [ ] Checkout a new local branch for the `tor-browser` rebase - - **Example**: `git branch tor-browser-rebase FIREFOX_115_18_0esr_BUILD1` -- [ ] `tor-browser` rebase - - [ ] Note the current git hash of `HEAD` for `tor-browser` rebase+autosquash step: `git rev-parse HEAD` - - [ ] Cherry-pick the appropriate previous `tor-browser` branch's commit range up to the last `tor-browser` `build1` tag - - **Example**: `git cherry-pick FIREFOX_115_17_0esr_BUILD1..tor-browser-115.17.0esr-13.5-1-build2` - - [ ] Rebase and autosquash these newly cherry-picked commits: `git rebase --autosquash --interactive $(PREV_HEAD)` - - **Example**: `git rebase --autosquash --interactive FIREFOX_115_18_0esr_BUILD1` - - [ ] Cherry-pick remainder of patches after the last `tor-browser` `build1` tag - - **Example**: `git cherry-pick tor-browser-115.17.0esr-13.5-1-build1..upstream/tor-browser-115.17.0esr-13.5-1` - - [ ] Rebase and `pick` new security backport patches to the end of the **MOZILLA BACKPORTS** section of the commit history - - **Example**: `git rebase --interactive FIREFOX_115_18_0esr_BUILD1` - - [ ] Rebase and autosquash again, this time replacing all `fixup` and `squash` commands with `pick`. The goal here is to have all of the `fixup` and `squash` commits beside the commit which they modify, but kept un-squashed for easy debugging/bisecting. - - **Example**: `git rebase --autosquash --interactive FIREFOX_115_18_0esr_BUILD1` -- [ ] Compare patch sets to ensure nothing *weird* happened during conflict resolution: - - [ ] diff of diffs: - - Do the diff between `current_patchset.diff` and `rebased_patchset.diff` with your preferred difftool and look at differences on lines that starts with + or - - - `git diff $(ESR_TAG_PREV)..$(BROWSER_BRANCH_PREV) > current_patchset.diff` - - `git diff $(ESR_TAG)..$(BROWSER_BRANCH) > rebased_patchset.diff` - - diff `current_patchset.diff` and `rebased_patchset.diff` - - If everything went correctly, the only lines which should differ should be the lines starting with `index abc123...def456` - - [ ] rangediff: `git range-diff $(ESR_TAG_PREV)..$(TOR_BROWSER_BRANCH_PREV) $(ESR_TAG)..HEAD` - - **Example**: `git range-dif FIREFOX_115_17_0esr_BUILD1..upstream/tor-browser-115.17.0esr-13.5-1 FIREFOX_115_18_0esr_BUILD1..HEAD` -- [ ] Open MR for the `tor-browser` rebase -- [ ] Merge - -### **Sign and Tag** - -- [ ] Sign/Tag `HEAD` of the merged `tor-browser` branch: - - In **tor-browser.git**, checkout the new legacy `tor-browser` branch - - In **tor-browser-build.git**, run signing script: - ```bash - ./tools/browser/sign-tag.torbrowser legacy build1 - ``` - - [ ] Push tag to `upstream` - - - ---- - -/label ~"Apps::Product::TorBrowser" -/label ~"Apps::Type::Rebase" -/label ~"Apps::Impact::High" -/label ~"Priority::Blocker" ===================================== .gitlab/issue_templates/063 Rebase - Rapid.md deleted ===================================== @@ -1,294 +0,0 @@ -# ⤵️ Rebase Rapid - -- **NOTE**: All examples in this template reference the rebase from Firefox 129.0a1 to 130.0a1 -- **TODO**: - - Documentation step for any difficulties or noteworthy things for each rapid rebase - -<details> - <summary>Explanation of Channels</summary> - - There are unfortunately some collisions between how we and Mozilla name our release channels which can make things confusing: - - **Firefox**: - - **Nightly**: \_START and \_END tags, version in the format `$(MAJOR).$(MINOR)a1` - - **Example**: Firefox Nightly 130 was `130.0a1` - - **Note**: Nightly is 2 major versions ahead of the current Release - - **Beta**: tagged each Monday, Wednesday, and Friday until release, version in the format `$(MAJOR).$(MINOR)b$(PATCH)` - - **Example**: the first Firefox Beta 130 was `130.0b1` - - **Note**: Beta is 1 major version ahead of the current Release, should be irrelevant to us - - **Release**: tagged monthly, version in the format `$(MAJOR).$(MINOR)` or `$(MAJOR).$(MINOR).$(PATCH)` - - **Example** Firefox Release 130 was `130.0` - - **ESR**: tagged monthly, version in the format `$(ESR_MAJOR).$(ESR_MINOR).$(ESR_PATCH)esr` - - **Example**: Firefox ESR 128.1 is `128.1.0esr` - - **Tor+Mullvad Browser**: - - **Rapid**: tagged monthly, based on the latest Firefox Nightly - - **Nightly**: not tagged, built nightly from our current Alpha branch's `HEAD` - - **Alpha**: tagged monthly, based on the latest Firefox ESR - - **Stable**: tagged monthly, based on oldest supported Firefox ESR - -</details> - -<details> - <summary>Branching Overview</summary> - - Rebasing Tor Browser Rapid onto the current Firefox Nightly is a bit more confusing/involved than rebasing Tor Browser Alpha or Stable from one minor ESR to the next minor ESR. - - The general process basically involves rebasing the previous Firefox Nightly-based Tor Browser Rapid onto the latest Firefox Nightly, and then cherry-picking all of the commits from the previous Firefox ESR-based Tor Browser Alpha after that channel's `build1` tag. This process presumes that the previous Tor Browser Alpha branch is locked and receiving no more changes. - - This diagram provides a high-level view of the overall code-flow for rebasing/cherry-picking commits from Tor Browser Alpha based on Firefox 128.1.0esr and Tor Browser Rapid based on Firefox 129.0a1 onto Firefox 130.0a1: - - ```mermaid -%%{init: { 'themeVariables': {'git0': '#0072b2', 'gitBranchLabel0': '#fff', 'git1': "#e69f00", 'gitBranchLabel1': '#fff', 'git2': '#009e73', 'gitBranchLabel2': '#fff', 'git3': '#cc79a7', 'gitBranchLabel3': '#fff'}, 'gitGraph': {'mainBranchName': 'tor-browser-128.1.0esr-14.5-1'}} }%% -gitGraph: - branch tor-browser-129.0a1-15.0-2 - branch tor-browser-130.0a1-15.0-1 - branch tor-browser-130.0a1-15.0-2 - - checkout tor-browser-128.1.0esr-14.5-1 - commit id: "FIREFOX_128_1_0esr_BUILD1" - commit id: "base-browser-128.1.0esr-14.5-1-build1" - commit id: "tor-browser-128.1.0esr-14.5-1-build1" - commit id: "tor-browser-128.1.0esr-14.5-1-build2" - - checkout tor-browser-129.0a1-15.0-2 - commit id: "FIREFOX_NIGHTLY_129_END" - %% commit id: "tor-browser-129.0a1-15.0-2-build1" - - checkout tor-browser-130.0a1-15.0-1 - commit id: "FIREFOX_NIGHTLY_130_END" - - checkout tor-browser-130.0a1-15.0-2 - commit id: "FIREFOX_NIGHTLY_130_END " - - checkout tor-browser-130.0a1-15.0-1 - merge tor-browser-129.0a1-15.0-2 - - checkout tor-browser-130.0a1-15.0-2 - merge tor-browser-130.0a1-15.0-1 - - - checkout tor-browser-129.0a1-15.0-2 - commit id: "tor-browser-129.0a1-15.0-2-build1" - - checkout tor-browser-130.0a1-15.0-1 - merge tor-browser-129.0a1-15.0-2 id: "tor-browser-130.0a1-15.0-1-build1" - - checkout tor-browser-130.0a1-15.0-2 - merge tor-browser-130.0a1-15.0-1 - - checkout tor-browser-130.0a1-15.0-1 - merge tor-browser-128.1.0esr-14.5-1 - - checkout tor-browser-130.0a1-15.0-2 - merge tor-browser-130.0a1-15.0-1 - - checkout tor-browser-128.1.0esr-14.5-1 - commit id: "tor-browser-128.1.0esr-14.5-1" - - checkout tor-browser-130.0a1-15.0-1 - merge tor-browser-128.1.0esr-14.5-1 id:"tor-browser-130.0a1-15.0-1-build2" - - checkout tor-browser-130.0a1-15.0-2 - - merge tor-browser-130.0a1-15.0-1 - commit id: "tor-browser-130.0a1-15.0-2-build1" - - ``` - - In this concrete example, the rebaser performs the following steps: - - create new `tor-browser-130.0a1-15.0-1`, and `tor-browser-130.0a1-15.0-2` branches from the `FIREFOX_NIGHTLY_130_END` tag. - - these will be the rebase review branches - - onto `tor-browser-130.0a1-15.0-1`, cherry-pick the range `FIREFOX_NIGHTLY_129_END..tor-browser-129.0a1-15.0-2-build1` (i.e. the Firefox Nightly 129-based Tor Browser Rapid commits) - - this updates the previous Tor Browser Rapid onto Firefox Nightly 130 - - cherry-pick the new alpha patches onto `tor-browser-130.0a1-15.0-1` (i.e. cherry-pick `tor-browser-128.1.0esr-14.5-1-build2..origin/tor-browser-128.1.0esr-14.5-1`) - - onto `tor-browser-130.0a1-15.0-2`, rebase and autosquash the `FIREFOX_NIGHTLY_130_END..tor-browser-130.0a1-15.0-2-build1` commit range - - onto `tor-browser-130.0a1-15.0-2`, cherry-pick the remaining commit range `tor-browser-130.0a1-15.0-2-build1..origin/tor-browser-130.0a1-15.0-2` - - re-order any remaining fixup! commits to be adjacent to their parents (i.e. the same rebase command queue as one would get from `git rebase --autosquash`, but with the `fixup!` commands replaced with `pick!` commands). - - this re-organises the branch in a nicely-bisectable way, and will ensure the rebase+autosquash step for the next release *should* succeed without any additional effort - -</details> - -<details> - <summary>Explanation of Variables</summary> - -- `$(NIGHTLY_VERSION)`: the Mozilla defined nightly version, used in various places for building tor-browser tags, labels, etc - - **Example**: `130.0a1` -- `$(NIGHTLY_TAG)`: the Mozilla defined hg (Mercurial) tag associated with `$(NIGHTLY_VERSION)` - - **Example**: `FIREFOX_NIGHTLY_130_END` -- `$(NIGHTLY_TAG_PREV)`: the Mozilla defined hg (Mercurial) tag associated with the previous nightly version when rebasing (ie, the nightly version we are rebasing from) - - **Example**: `FIREFOX_NIGHTLY_129_END` -- `$(BROWSER_VERSION)`: the browser version which will first be based on the next major ESR version this *Firefox* Nightly series is leading up to - - **Example**: `15` -- `$(TOR_BROWSER_BRANCH)`: the full name of the current `tor-browser` branch based off of the Firefox Nightly channel - - **Example**: `tor-browser-130.0a1-15.0-1` -- `$(TOR_BROWSER_BRANCH_PREV)`: the full name of the previous `tor-browser` branch based off of the Firefox Nightly channel - - **Example**: `tor-browser-129.0a1-15.0-1` -</details> - -### Update Branch Protection Rules - -- [ ] In [Repository Settings](https://gitlab.torproject.org/tpo/applications/tor-browser/-/sett…: - - [ ] Remove previous nightly `tor-browser` branch protection rules (this will prevent pushing new changes to the branches being rebased) - - [ ] Create new `base-browser` and `tor-browser` branch protection rule: - - **Branch**: `(tor|base)-browser-$(NIGHTLY_VERSION)-$(BROWSER_VERSION)-*` - - **Example**: `(tor|base)-browser-130.0a1-15.0-*` - - **Allowed to merge**: `Maintainers` - - **Allowed to push and merge**: `Maintainers` - - **Allowed to force push**: `false` - - ⚠️ **IMPORTANT**: If you copied and pasted from old rules, double check you didn't add spaces at the end, as GitLab will not trim them! - -### **Create New Branches** - -- [ ] Fetch Mozilla's firefox repo and identify this release's ${NIGHTLY_TAG} -- [ ] Create two new rapid `tor-browser` branches from Firefox ${NIGHTLY_TAG} - - Branch name in the form: `tor-browser-$(NIGHTLY_VERSION)-$(BROWSER_VERSION)-${BRANCH_NUM}` - - **Example**: `tor-browser-130.0a1-15.0-1` and `tor-browser-130.0a1-15.0-2` -- [ ] Push new `tor-browser` branches and the `firefox` tag to `upstream` - -### **Rebase previous `-2` rapid branch's HEAD onto current `-1` rapid branch** - -- **Desired outcome**: - - An easy to review branch with the previous rapid branch rebased onto the latest Firefox Nighty tag - - It must be possible to run `git range-diff` between the previous `-2` and the new branch - - We want to see only the effects of the rebase - - No autosquash should happen at this point - - **Expected difficulties**: - - Conflicts with upstream developments - - Sometimes it will be hard to keep a feature working. It's fine to drop it, and create an issue to restore it after a deeper investigation. -- [ ] Checkout a new local branch for the first part of the `-1` rebase - - **Example**: `git checkout -b rapid-rebase-part1 origin/tor-browser-130.0a1-15.0-1` -- [ ] Firefox Nightly-based `tor-browser` rebase: - - [ ] cherry-pick previous Tor Browser Rapid `-2` branch to new `-1` rebase branch - - **Example**: `git cherry-pick FIREFOX_NIGHTLY_129_END..origin/tor-browser-129.0a1-15.0-2` -- [ ] Rebase Verification: - - [ ] Clean range-diff between the previous rapid branch and current rebase branch - - **Example**: - ```bash - git range-diff FIREFOX_NIGHTLY_129_END..origin/tor-browser-129.0a1-15.0-2 FIREFOX_NIGHTLY_130_END..rapid-rebase-part1 - ``` - - [ ] Optional: clean diff of diffs between previous rapid branch and current rebase branch - - **Example**: - ```bash - git diff FIREFOX_NIGHTLY_129_END origin/tor-browser-129.0a1-15.0-2 > 129.diff - git diff FIREFOX_NIGHTLY_130_END HEAD > 130.diff - # A two-column diff tool is suggested rather than plain-diff, e.g., meld on Linux. - meld 129.diff 130.diff - ``` - - **Note**: Only differences should be due to resolving merge conflicts with upstream changes from Firefox Nightly -- [ ] Open MR -- [ ] Merge -- [ ] Sign/Tag `HEAD` of the merged `tor-browser` branch: - - In **tor-browser.git**, checkout the `-1` rapid `tor-browser` branch - - In **tor-browser-build.git**, run signing script: - ```bash - ./tools/browser/sign-tag.torbrowser rapid build1 - ``` - - [ ] Push tag to `upstream` - -### **Port new alpha patches to `-1`** - -- **Desired outcome**: - - The previous release-cycle's new alpha patches cherry-picked to the end of the current nightly - - It must be possible to run `git range-diff ESR-build1..ESR NIGHTLY-build1..` - - **Expected difficulties**: - - Conflicts with upstream developments (similar to the previous part) - - The range might contain cherry-picked upstream commits, which will result in empty commits: it's fine to skip them - - **Note**: The Tor Browser Alpha branch should be closed at this point and not receiving any more MRs -- [ ] Checkout a new local branch for the second part of the `-1` rebase - - **Example**: `git checkout -b rapid-rebase-part2 origin/tor-browser-130.0a1-15.0-1` -- [ ] Cherry-pick the new `tor-browser` alpha commits (i.e. the new dangling commits which did not appear in the previous Tor Browser Alpha release): - - **Example** `git cherry-pick tor-browser-128.1.0esr-14.5-1-build1..origin/tor-browser-128.1.0esr-14.5-1` -- [ ] Rebase Verification - - [ ] Clean range-diff between the alpha patch set ranges - - **Example**: - ```bash - git range-diff tor-browser-128.1.0esr-14.5-1-build1..origin/tor-browser-128.1.0esr-14.5-1 origin/tor-browser-130.0a1-15.0-1..HEAD - ``` - - [ ] Clean diff of diffs between the alpha patch set ranges - - **Example**: - ```bash - git diff tor-browser-128.1.0esr-14.5-1-build1 origin/tor-browser-128.1.0esr-14.5-1 > 128.1.0esr.diff - git diff origin/tor-browser-130.0a1-15.0-1 HEAD > 130.diff - # A two-column diff tool is suggested rather than plain-diff, e.g., meld on Linux. - meld 128.1.0esr.diff 130.diff - ``` - - **Note**: Only differences should be due to resolving merge conflicts with upstream changes from Firefox Nightly -- [ ] Open MR -- [ ] Merge -- [ ] Sign/Tag `HEAD` of the merged `tor-browser` branch: - - In **tor-browser.git**, checkout the `-1` rapid `tor-browser` branch - - In **tor-browser-build.git**, run signing script: - ```bash - ./tools/browser/sign-tag.torbrowser rapid build2 - ``` - - [ ] Push tag to `upstream` - -### **Squash and Reorder tor-browser `-1` branch to new `-2` branch** -- **Desired outcome**: - - The rapid branch from the previous step prepared for the next nightly - - **Rationale**: - - We squash a lot of commits. We want to keep them a little bit longer rather than squashing them immediately for troubleshooting and documentation purposes. - - Doing this as a separate pass helps to separate errors due to upstream changes from errors due to processes created by our workflow. - - **Expected difficulties**: - - our patches aren't disjoint, therefore we might have conflicts when shuffling them around. -- [ ] Checkout a new local branch for the `-2` rebase, aligned to -1-build1 - - **Example**: `git checkout -b rapid-rebase-part3 tor-browser-130.0a1-15.0-1-build1` -- [ ] Rebase with autosquash. This step should be trivial and not involve any conflicts. - - **Example**: `git rebase -i --autosquash FIREFOX_NIGHTLY_130_END` -- [ ] Cherry-pick the remaining commits - - **Example**: `git cherry-pick tor-browser-130.0a1-15.0-1-build1..upstream/tor-browser-130.0a1-15.0-1` -- [ ] Create a branch for self-reviewing purposes, or take note of the current commit hash somewhere - - **Example**: `git branch rapid-rebase-part3-review` - - You do not need to publish this, and you can delete it at the end of the process (`git branch -D rapid-rebase-part3-review`) - - When you are a reviewer, it might be useful to repeat these steps locally. They should not involve mental overhead (and PieroV has a script to automate this) -- [ ] Rebase and reorder commits (i.e. replace `fixup `, `fixup -C ` and `squash ` with `pick ` commands) - - Notice the space at the end, to avoid replacing `fixup!` with `pick!` in the commit subject, even though git will probably not care of such changes -- [ ] Rebase Verification - - [ ] Clean range-diff between the temporary review branch and the final branch - - **Example**: - ```bash - git range-diff FIREFOX_NIGHTLY_130_END..rapid-rebase-part3-review FIREFOX_NIGHTLY_130_END..rapid-rebase-part3 - ``` - - If you are the reviewer, it should be trivial to create such a branch on your own, as no shuffling is involved - - [ ] Clean diff of diffs between rapid branches - - **Example**: - ```bash - git diff FIREFOX_NIGHTLY_130_END tor-browser-130.0a1-15.0-1-build2 > 130-1.diff - git diff FIREFOX_NIGHTLY_130_END HEAD > 130-2.diff - ``` - - [ ] Understandable range-diff (i.e. `fixup!` patches are distributed from end of branch next to their parent) - - **Example**: - ```bash - git range-diff FIREFOX_NIGHTLY_130_END..tor-browser-130.0a1-15.0-1-build2 FIREFOX_NIGHTLY_130_END..HEAD - ``` -- [ ] Open MR -- [ ] Merge -- [ ] Sign/Tag `HEAD` of the merged `tor-browser` branch: - - In **tor-browser.git**, checkout the `-2` rapid `tor-browser` branch - - In **tor-browser-build.git**, run signing script: - ```bash - ./tools/browser/sign-tag.torbrowser rapid build1 - ``` - - [ ] Push tag to `upstream` - -### **Create and Tag base-browser `-2` branch** -- [ ] Find the last commit in the merged `-2` `tor-browser` branch with a `BB XXXXX...` subject -- [ ] Create new branch from this commit - - Branch name in the form: `base-browser-$(NIGHTLY_VERSION)-$(BROWSER_VERSION)-2` - - **Example**: `base-browser-130.0a1-15.0-2` -- [ ] Push branch to `upstream` -- [ ] Sign/Tag latest `HEAD` of the merged `base-browser` branch: - - In **tor-browser.git**, checkout the `-2` rapid `tor-browser` branch - - In **tor-browser-build.git**, run signing script: - ```bash - ./tools/browser/sign-tag.basebrowser rapid build1 ${COMMIT} - ``` - - [ ] Push tag to `upstream` - - - ---- - -/label ~"Apps::Product::TorBrowser" -/label ~"Apps::Type::Rebase" -/label ~"Apps::Impact::High" -/label ~"Priority::High" ===================================== .gitlab/issue_templates/Default.md ===================================== @@ -16,10 +16,8 @@ Please select the appropriate issue template from the **Description** drop-down. - 🕰️ **Time-Gated Feature** - implement a new feature which must be enabled for a particular window in time - ⬅️ **Backport** - cherry-pick change to other release channels - ❌ **Revert** - revert a change -- ⤵️ **Rebase - Alpha** - rebase alpha to latest Firefox ESR version +- ⤵️ **Rebase - Alpha** - rebase alpha to latest Firefox Nightly version - ⤵️ **Rebase - Stable** - rebase stable to latest Firefox ESR version -- ⤵️ **Rebase - Legacy** - rebase legacy to latest Firefox ESR 115 version -- ⤵️ **Rebase - Rapid** - rebase rapid to latest Firefox Nightly version - ⬆️ **Uplift** - uplift change to upstream project - 🛡️ **Security Backports** - cherry-pick security fixes from Firefox - 🚨 **Emergency Security Issue** - manage fixing and publishing a critical security fix View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2a86ee… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2a86ee… You're receiving this email because of your account on gitlab.torproject.org.

1 0