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.

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

Fix couple of version related bugs #291

Merged
merged 4 commits into from Aug 9, 2016
Merged

Fix couple of version related bugs #291

merged 4 commits into from Aug 9, 2016

Conversation

mithro
Copy link
Member

@mithro mithro commented Aug 9, 2016 •
edited

@mithro
travis: Echo the version info again.
86a7bd6 
The actual version info moved into the version_data.c file in
timvideos#271
@mithro
third_party: Move to liteeth/liteusb modules with gitignore files.
c19cd32 
Fixes timvideos#206.

This should fix the problem with liteeth/liteusb being listed as "dirty" in the
version output;
----------------------------------------------
const char* git_commit = "ab676e4445e211fde201c335b875e0facd838f87";
const char* git_branch = "master";
const char* git_describe = "v0.0.2-69-gab676e4-dirty";
const char* git_status =
    "    --\n"
    "     M ../../third_party/liteeth\n"
    "     M ../../third_party/liteusb\n"
    "    --\n";
----------------------------------------------
@mithro mithro changed the title travis: Echo the version info again. Fix couple of version related bugs Aug 9, 2016
@mithro mithro added this to the Travis Quality Control milestone Aug 9, 2016
@mithro mithro force-pushed the travis-version-output-fix branch 3 times, most recently from 564fdf3 to 932064d Compare August 9, 2016 06:07
@mithro mithro merged commit 70cb993 into timvideos:master Aug 9, 2016
@mithro mithro removed the in progress label Aug 9, 2016
@mithro mithro deleted the travis-version-output-fix branch February 7, 2017 21:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
boards-all firmware-softcpu hdmi2*** level-infrastructure type-bug
Projects
None yet
Milestone
Travis Quality Control
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@mithro