Opened 6 months ago

Closed 5 months ago

#24879 closed task (fixed)

Set 'fetch: 1' by default for nightly builds

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

Description

In tor-browser-build, when doing some build, we fetch new commits/branchs/tags from a git repository when the git revision specified in git_hash does not exist in the local repository. If the revision already exist, we don't update the repository. This means that if git_hash is pointing to a branch like master and the master branch already exists, it won't be updated. This can be confusing for the nightly builds, where you have to remember to run make fetch first if you want to build the very latest nightly, and not a nightly based on the commits from the last make fetch.

To avoid that we can set fetch: 1 for nightly in rbm.conf so that git repositories are updated for each build by default. People who don't want that can still change it in their rbm.local.conf.

Child Tickets

Change History (8)

comment:1 Changed 6 months ago by boklm

Keywords: TorBrowserTeam201801R added; TorBrowserTeam201801 removed
Status: newneeds_review

comment:2 Changed 6 months ago by gk

Keywords: TorBrowserTeam201801 added; TorBrowserTeam201801R removed
Status: needs_reviewneeds_revision

It seems to me we want to have the comment block in rbm.local.conf indented by another 2 chars?

comment:3 Changed 5 months ago by gk

Keywords: TorBrowserTeam201802 added; TorBrowserTeam201801 removed

Moving tickets to Feb

comment:4 Changed 5 months ago by gk

I guess this would fix test builds as well in case they are based on nightlies, right? boklm: could you fix up the small thing mentioned in comment:2? It seems I ran into it today again missing to update the tor browser branch for testing the fix for #23136. :(

comment:5 in reply to:  2 Changed 5 months ago by boklm

Keywords: TorBrowserTeam201802R added; TorBrowserTeam201802 removed
Status: needs_revisionneeds_review

Replying to gk:

It seems to me we want to have the comment block in rbm.local.conf indented by another 2 chars?

Actually the error was in rbm.conf, as the option we should set is fetch and not var/fetch.

I fixed that in branch bug_24879_v3:
https://gitweb.torproject.org/user/boklm/tor-browser-build.git/commit/?h=bug_24879_v3&id=0eefe1adbcd19990a94842723872dd129de1535a

I also changed the comment in rbm.local.conf.example to use if_needed instead of 0.

This should also apply to testbuild when it is based on nightly.

comment:6 Changed 5 months ago by gk

Keywords: TorBrowserTeam201802 added; TorBrowserTeam201802R removed
Status: needs_reviewneeds_revision

Thanks. It seems we want to have "if the selected commit" instead of "if the select commit"?

comment:7 in reply to:  6 Changed 5 months ago by boklm

Keywords: TorBrowserTeam201802R added; TorBrowserTeam201802 removed
Status: needs_revisionneeds_review

Replying to gk:

Thanks. It seems we want to have "if the selected commit" instead of "if the select commit"?

I updated this in branch bug_24879_v5:
https://gitweb.torproject.org/user/boklm/tor-browser-build.git/commit/?h=bug_24879_v5&id=95b5c738d8e1a11596e652363e801e500c5733de

comment:8 Changed 5 months ago by gk

Resolution: fixed
Status: needs_reviewclosed

Looks good. Merged to master (commit 95b5c738d8e1a11596e652363e801e500c5733de).

Note: See TracTickets for help on using tickets.