Skip to content

nightly: Support relative submodule paths #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 8, 2021
Merged

nightly: Support relative submodule paths #54

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions nightly-tarball/Builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,12 +376,11 @@ def prepare_source_tree(self):
# origin/<branch>/HEAD
self._logger.debug("Switching to branch: " + branch)
if not branch in repo.heads:
# TODO: Can we avoid calling into repo.git here?
repo.git.checkout('origin/' + branch, b=branch)
repo.head.reference = repo.refs['origin/' + branch]
repo.git.checkout(branch)
repo.head.reference = repo.refs[branch]

# And pull in all the right submodules
repo.submodule_update(recursive = True)
repo.git.submodule('update', '--init', '--recursive')

# wish I could figure out how to do this without resorting to
# shelling out to git :/
Expand Down