Skip to content
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

Jump to bottom

phase1: satisfy getver.sh requirements #9

Merged
merged 1 commit into from
May 23, 2023
Merged

phase1: satisfy getver.sh requirements #9

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 10 additions & 0 deletions phase1/master.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,6 +744,16 @@ for target in targets:
haltOnFailure = True,
))

# getver.sh requires local branches to track upstream otherwise version computation fails.
# Git() does not set tracking branches when cloning or switching, so work around this here
factory.addStep(ShellCommand(
name = "trackupstream",
description = "Setting upstream branch",
descriptionDone = "getver.sh is happy now",
command = ["git", "branch", "-u", Interpolate("origin/%(prop:branch)s")],
haltOnFailure = True,
))

# Verify that Git HEAD points to a tag or branch
# Ref: https://web.archive.org/web/20190729224316/http://lists.infradead.org/pipermail/openwrt-devel/2019-June/017809.html
factory.addStep(ShellCommand(
Expand Down