Opened 16 months ago

Closed 16 months ago

Last modified 16 months ago

#26428 closed defect (fixed)

Starting a stable Tor Browser build fails with `git submodule` error

Reported by: gk Owned by: tbb-team
Priority: Immediate Milestone:
Component: Applications/Tor Browser Version:
Severity: Blocker Keywords: tbb-rbm, TorBrowserTeam201806R
Cc: boklm, legind Actual Points:
Parent ID: Points:
Reviewer: Sponsor:

Description

For some reason fetching git submodules for HTTPS-Everywhere fails now with

Error: Error running git submodule update:
fatal: No url found for submodule path 'checkout' in .gitmodules

Makefile:6: recipe for target 'release' failed
make: *** [release] Error 1

if I test starting a build with tbb-7.5.6-build1. Setting git_submodule: 0 "resolves" this.

Child Tickets

Change History (6)

comment:1 Changed 16 months ago by boklm

Cc: legind added

When manually cloning the https-everywhere repository, checking out 2018.6.13 and running git submodule update --init, I also get the same error:

No submodule mapping found in .gitmodules for path 'checkout'

So it seems to be a problem in the https-everywhere commit.

comment:2 Changed 16 months ago by boklm

It seems that commit 3954e0b1e75d3a02ab959bc5e8e952948bb67d7e is adding a submodule in directory checkout, but without adding corresponding infos to .gitmodules:

commit 3954e0b1e75d3a02ab959bc5e8e952948bb67d7e
Author: William Budington <bill@eff.org>
Date:   Wed Jun 13 15:46:49 2018 -0700

    Release: 2018.6.13

diff --git a/checkout b/checkout
new file mode 160000
index 0000000..430ca8f
--- /dev/null
+++ b/checkout
@@ -0,0 +1 @@
+Subproject commit 430ca8f615f6b093f9fbaf63de8ab941538c49df

So this looks like something added by error.

comment:3 Changed 16 months ago by boklm

Keywords: TorBrowserTeam201806R added; TorBrowserTeam201806 removed
Status: newneeds_review

As a temporary fix until legind can fix it in a new release, I forked the https-everywhere repository on github, and added a commit removing the checkout submodule.

In branch bug_26428 we are using this commit removing the checkout submodule:
https://gitweb.torproject.org/user/boklm/tor-browser-build.git/commit/?h=bug_26428&id=b3cc97d4e4adb4709c1e367d82bd1e389bba60f0

This is fixing the https-everywhere build for me.

comment:4 Changed 16 months ago by legind

This was committed erroneously during the release process. I've removed it in a subsequent commit, and it will not be present in future release tags. Your solution works fine, boklm, or just adding the rm checkout command after cloning would work as well. Sorry for the hiccup.

comment:5 in reply to:  4 Changed 16 months ago by gk

Resolution: fixed
Status: needs_reviewclosed

Replying to legind:

This was committed erroneously during the release process. I've removed it in a subsequent commit, and it will not be present in future release tags. Your solution works fine, boklm, or just adding the rm checkout command after cloning would work as well. Sorry for the hiccup.

Thanks for the update (it saves me filing a ticket). I went ahead with boklm's solution and applied it to maint-7.5 (commit b3cc97d4e4adb4709c1e367d82bd1e389bba60f0). We probably want it for master, too. I'll look at that tomorrow.

comment:6 Changed 16 months ago by boklm

There is a new tag 2018.6.21, so it looks like we can revert b3cc97d4e4adb4709c1e367d82bd1e389bba60f0 and use the new tag.

Note: See TracTickets for help on using tickets.