Opened 12 months ago

Closed 2 months ago

#25849 closed defect (fixed)

Ship tor in Tor Browser nightly builds for Windows with Rust enabled

Reported by: gk Owned by: tbb-team
Priority: Medium Milestone:
Component: Applications/Tor Browser Version:
Severity: Normal Keywords: tbb-rbm, TorBrowserTeam201902R, boklm201811, GeorgKoppen201902
Cc: boklm Actual Points:
Parent ID: Points:
Reviewer: Sponsor:

Description

Similar to #25481 we want to start shipping tor with Rust support enabled in our nightly builds for Windows.

Child Tickets

TicketStatusOwnerSummaryComponent
#25894closedtbb-teamGet a rust cross-compiler for WindowsApplications/Tor Browser
#25895closedHello71Cross-compiling tor rust for Windows is brokenCore Tor/Tor

Change History (13)

comment:1 Changed 12 months ago by boklm

Keywords: boklm201805 added; boklm201804 removed

boklm201804 -> boklm201805

comment:2 Changed 12 months ago by gk

Keywords: ff60-esr removed

We need help from the network team with that. It's not necessary for the switch to ESR60, though.

comment:3 Changed 11 months ago by boklm

Keywords: boklm201806 added; boklm201805 removed

boklm201805 -> boklm201806

comment:4 Changed 11 months ago by gk

Parent ID: #25220

comment:5 Changed 10 months ago by boklm

Keywords: boklm201807 added; boklm201806 removed

boklm201806 -> boklm201807

comment:6 Changed 8 months ago by boklm

Keywords: boklm201809 added; boklm201807 removed

boklm201807 -> boklm201809

comment:7 Changed 5 months ago by boklm

Keywords: boklm201811 added; boklm201809 removed

boklm201809 -> boklm201811

comment:8 Changed 2 months ago by gk

Keywords: TorBrowserTeam201902R GeorgKoppen201902 added; TorBrowserTeam201804 removed
Status: new → needs_review

Finally: bug_25849_v2 (commit 21677b3571d9a7975b50074673169c6a6dc83b05). Please review.

comment:9 Changed 2 months ago by cypherpunks

Is that correct that you apply unwind_128.patch to Firefox Nightly also?

comment:10 in reply to:  9 ; Changed 2 months ago by gk

Cc: boklm added
Keywords: TorBrowserTeam201902R GeorgKoppen201902 removed
Status: needs_review → needs_revision

Replying to cypherpunks:

Is that correct that you apply unwind_128.patch to Firefox Nightly also?

Good catch. No, it is not correct. I hoped I can somehow avoid version comparisons. Maybe boklm has a good idea whether we can achieve that.

comment:11 in reply to:  10 Changed 2 months ago by boklm

Replying to gk:

Replying to cypherpunks:

Is that correct that you apply unwind_128.patch to Firefox Nightly also?

Good catch. No, it is not correct. I hoped I can somehow avoid version comparisons. Maybe boklm has a good idea whether we can achieve that.

I think you can add something like this to projects/tor/config:

diff --git a/projects/tor/config b/projects/tor/config
index 80282ea..f4b8e8f 100644
--- a/projects/tor/config
+++ b/projects/tor/config
@@ -68,4 +68,5 @@ input_files:
     input_file_var:
       rust_version: 1.28.0
       prev_version: 1.27.2
+      unwind_128: '[% c("var/windows-i686") %]'
     enable: '[% (c("var/linux") || c("var/osx")) && c("var/nightly") %]'

And then use input_file_var/unwind_128 in the conditions to apply unwind_128.patch.

comment:12 Changed 2 months ago by gk

Keywords: TorBrowserTeam201902R GeorgKoppen201902 added

Thanks, that's a good idea. bug_25849_v3 (​https://gitweb.torproject.org/user/gk/tor-browser-build.git/commit/?h=bug_25849_v3&id=3de8afa44fa4a7078f917263147f6e19107e3141) has the adapted fix.

comment:13 Changed 2 months ago by boklm

Resolution: → fixed
Status: needs_revision → closed

This looks good to me. I merged this to master with commit d500c61974ff1cdbccd31a64181aa10cb1e9482f.

Note: See TracTickets for help on using tickets.