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

bugfix: git sha1 script requires bash #179

Merged
merged 1 commit into from Jul 4, 2019
Merged

Conversation

@csboling
Copy link
Collaborator

@csboling csboling commented Jul 4, 2019

What does this PR do?

Without specifying a shell, make will use /bin/sh, which on some environments (Ubuntu, and therefore this Dockerfile) is not bash. This causes redirection to fail in the bit that generates the git sha1 to embed in the firmware. Also git describe --always --dirty was winding up with two different version numbers in the string displayed on Teletype, like 3.0.0 v2.2.0-alpha.7-244 as well as the wrong tag for some reason, this change adds --exclude '*' to omit tags in this part so you just get a version + sha like 3.0.0 0F3DAA7-DIRTY.

Provide links to any related discussion on lines.

This was causing some confusion because the version number was coming out weird from my builds: 1, 2

How should this be manually tested?

Build ye Firm-Ware, flafhe ye Module.

I have,

  • updated CHANGELOG.md (N/A)
  • updated the documentation (N/A)
  • run make format on each commit (N/A)
@tehn tehn merged commit 963d426 into monome:master Jul 4, 2019
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@tehn
Copy link
Member

@tehn tehn commented Jul 4, 2019

thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants