Opened 14 months ago

Closed 6 months ago

#25779 closed defect (fixed)

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

Reported by: gk Owned by: tbb-team
Priority: High Milestone:
Component: Applications/Tor Browser Version:
Severity: Normal Keywords: tbb-rbm, TorBrowserTeam201812R, GeorgKoppen201812, boklm201811
Cc: teor 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 macOS.

Child Tickets

TicketStatusOwnerSummaryComponent
#25975closedtbb-teamGet a rust cross-compiler for macOSApplications/Tor Browser
#25977closedCross-compiling tor rust for macOS is brokenCore Tor/Tor

Change History (13)

comment:1 Changed 14 months ago by teor

Cc: teor added

comment:2 Changed 14 months ago by gk

Similar to Windows we need to split up this task and do the rust compiler + the tor work in child tickets. It seems we need explicit rust cross-compile support for macOS, too.

comment:3 Changed 14 months ago by boklm

Keywords: boklm201805 added; boklm201804 removed

boklm201804 -> boklm201805

comment:4 Changed 13 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:5 Changed 13 months ago by boklm

Keywords: boklm201806 added; boklm201805 removed

boklm201805 -> boklm201806

comment:6 Changed 13 months ago by gk

Parent ID: #25220

comment:7 Changed 12 months ago by boklm

Keywords: boklm201807 added; boklm201806 removed

boklm201806 -> boklm201807

comment:8 Changed 10 months ago by boklm

Keywords: boklm201809 added; boklm201807 removed

boklm201807 -> boklm201809

comment:9 Changed 7 months ago by boklm

Keywords: boklm201811 added; boklm201809 removed

boklm201809 -> boklm201811

comment:10 Changed 6 months ago by gk

Keywords: TorBrowserTeam201812R GeorgKoppen201812 added; TorBrowserTeam201804 GeorgKoppen201804 removed
Status: newneeds_review

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

Keywords: TorBrowserTeam201812 added; TorBrowserTeam201812R removed
Status: needs_reviewneeds_revision

Replying to gk:

See: bug_25779_v4 (https://gitweb.torproject.org/user/gk/tor-browser-build.git/commit/?h=bug_25779_v4&id=54f63e3176ec840e37c283689746b2a0cb419f8c) in my public repo for a patch.

I think we can simplify a little by defining some option like this:

diff --git a/projects/tor/config b/projects/tor/config
index 4ba18d9..7fba7d0 100644
--- a/projects/tor/config
+++ b/projects/tor/config
@@ -21,6 +21,8 @@ targets:
     version: '[% c("abbrev") %]'
     git_hash: master
     tag_gpg_id: 0
+    var:
+      tor_rust: '[% c("var/linux") || c("var/osx") %]'
 
   linux:
     var:

And then replacing the various tests using (c("var/linux") || c("var/osx")) && c("var/nightly") by c("var/tor_rust").

comment:12 in reply to:  11 Changed 6 months ago by boklm

Keywords: TorBrowserTeam201812R added; TorBrowserTeam201812 removed
Status: needs_revisionneeds_review

Replying to boklm:

I think we can simplify a little by defining some option like this:

After discussing this with GeKo on IRC, we are planning to add support for Windows or Android soon, so will not need this extra var. As it is only a minor improvement, I think it's fine not adding it. So the current patch looks good to me.

I am now testing a build of tor for macOS with this patch before merging it.

comment:13 in reply to:  10 Changed 6 months ago by boklm

Resolution: fixed
Status: needs_reviewclosed

Replying to gk:

See: bug_25779_v4 (https://gitweb.torproject.org/user/gk/tor-browser-build.git/commit/?h=bug_25779_v4&id=54f63e3176ec840e37c283689746b2a0cb419f8c) in my public repo for a patch.

I merged this to master with commit 0512b59d0cc4c68952454e85551659742930cb6d.

Note: See TracTickets for help on using tickets.