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

[tor-commits] [Git][tpo/applications/tor-browser-build][maint-15.0] 2 commits: Bug 41720 (fix): Use the new function for Android+Linux i686.

Title: GitLab

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

Commits:

  • f92bc229
    by Pier Angelo Vendrame at 2026-02-16T21:25:32+01:00 
    Bug 41720 (fix): Use the new function for Android+Linux i686.

When we cherry-picked the fix from main, we did not get any conflicts,
but we needed to update also the commands for Linux i686 and Android
x86, which have been dropped in 16.0aX, but are still built in 15.0.X.
  • 43d87140
    by Pier Angelo Vendrame at 2026-02-16T21:26:55+01:00 
    Bug 41709: Bump Tor Browser 15.0.6 to -build2.

2 changed files:

Changes:

  • projects/release/build
    ... ... @@ -19,7 +19,7 @@ function merge_directory {
    19 19 
       merge_directory "[% c('input_files_by_name/android-armv7') %]"
    20 20 
     [% END -%]
    21 21 
     [% IF c("var/browser_platforms/android-x86") -%]
    22 
    -  mv_files "[% c('input_files_by_name/android-x86') %]"
    22 
    +  merge_directory "[% c('input_files_by_name/android-x86') %]"
    23 23 
     [% END -%]
    24 24 
     [% IF c("var/browser_platforms/android-x86_64") -%]
    25 25 
       merge_directory "[% c('input_files_by_name/android-x86_64') %]"
    ... ... @@ -43,7 +43,7 @@ function merge_directory {
    43 43 
       merge_directory "[% c('input_files_by_name/macos-aarch64') %]"
    44 44 
     [% END -%]
    45 45 
     [% IF c("var/browser_platforms/linux-i686") -%]
    46 
    -  mv_files "[% c('input_files_by_name/linux-i686') %]"
    46 
    +  merge_directory "[% c('input_files_by_name/linux-i686') %]"
    47 47 
     [% END -%]
    48 48 
     [% IF c("var/browser_platforms/linux-x86_64") -%]
    49 49 
       merge_directory "[% c('input_files_by_name/linux-x86_64') %]"

  • rbm.conf
    ... ... @@ -75,7 +75,7 @@ buildconf:
    75 75
    76 76 
     var:
    77 77 
       torbrowser_version: '15.0.6'
    78 
    -  torbrowser_build: 'build1'
    78 
    +  torbrowser_build: 'build2'
    79 79 
       # This should be the date of when the build is started. For the build
    80 80 
       # to be reproducible, browser_release_date should always be in the past.
    81 81 
       browser_release_date: '2026/02/16 16:30:00'

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help Notification message regarding https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/357cde9bfa8fb19d4ad8b8cc388a86eb7ef69a43...43d87140d64c6c709ce02889196473349c227b04 at 1771273784 

    _______________________________________________
tor-commits mailing list -- tor-commits@xxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to tor-commits-leave@xxxxxxxxxxxxxxxxxxxx