Opened 2 years ago

Closed 2 years ago

#23680 closed defect (fixed)

Adapt the README.HACKING document to allow the user to modify the correct git_hash when testing branches/commits

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

Description

I tried to test the patches for #16778 and did the following in my tor-browser-build repo

-git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2'
-tag_gpg_id: 1
-git_url: https://git.torproject.org/tor-browser.git
+git_hash: 'bug16778_v2'
+tag_gpg_id: 0
+git_url: https://github.com/sysrqb/tor-browser

After doing a |make fetch| and |make testbuild| the new commits are not used. I verified that by inspecting the .tar ball we use in our container for building.

Child Tickets

Change History (4)

comment:1 Changed 2 years ago by boklm

When I try to build an alpha with those changes I get the following error:

./rbm/rbm build release --target testbuild --target torbrowser-all
Error: Cannot checkout bug16778_v2

I think this is because it says bug16778_v2 instead of bug16778_2. So it seems the commit is picked up for me.

I think a possible reason it is not picked-up for you is that you might be building a nightly. In that case targets/nightly/git_hash needs to be updated.

comment:2 Changed 2 years ago by gk

Component: Applications/rbmApplications/Tor Browser
Keywords: tbb-rbm added
Owner: changed from boklm to tbb-team
Summary: New commits are not picked up after pointing rbm to a new git_url and git_hashAdapt the README.HACKING document to allow the user to modify the correct git_hash when testing branches/commits

Okay, I cheated a bit as I actually wanted bug16678_2 but the main problem was that I have nightly builds specified in my local rbm conf file. Thus I modified the wrong git_hash.

I think we should update the HACKING doc for that fine distinction.

comment:3 Changed 2 years ago by boklm

Keywords: TorBrowserTeam201709R added
Status: newneeds_review

comment:4 Changed 2 years ago by gk

Resolution: fixed
Status: needs_reviewclosed

Thanks, looks good. Applied to master (commit 2d5b42b7b8bea03bf55fc3ad2c1ea993e18af191).

Note: See TracTickets for help on using tickets.