Skip to content

Fix GIT version in Makefile#317

Merged
shawndwells merged 1 commit intoopencontrol:masterfrom
redhatrises:fix_version
Jul 17, 2018
Merged

Fix GIT version in Makefile#317
shawndwells merged 1 commit intoopencontrol:masterfrom
redhatrises:fix_version

Conversation

@redhatrises
Copy link
Collaborator

Now that git tag is done properly, we should get the version with git describe

@codecov
Copy link

codecov bot commented Jul 13, 2018

Codecov Report

Merging #317 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #317   +/-   ##
=======================================
  Coverage   79.09%   79.09%           
=======================================
  Files          38       38           
  Lines        1430     1430           
=======================================
  Hits         1131     1131           
  Misses        246      246           
  Partials       53       53

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3f8739b...427a3b5. Read the comment docs.

@shawndwells
Copy link
Member

@redhatrises the old and new way report different versions. Is this intended?

$ git for-each-ref --format="%(refname:short)" --sort=-authordate --count=1 refs/tags | cut -d"v" -f2
1.1.3

$ git describe --abbrev=0 --tags | cut -d"v" -f2
1.1.4

@redhatrises
Copy link
Collaborator Author

@shawndwells yes... the latest version is 1.1.4 not 1.1.3

@shawndwells
Copy link
Member

Wasn't the question. The old way returned $ver-1, new way returns $ver.

Does this mean the old method always had a bug that is just now being exposed?

@redhatrises
Copy link
Collaborator Author

@shawndwells version 1.1.3 wasn't tagged correctly hence the old way was added. Now that version 1.1.4 was tagged correctly, this change uses the correct way of getting the tag for versioning.

@shawndwells shawndwells merged commit b120519 into opencontrol:master Jul 17, 2018
@shawndwells
Copy link
Member

thanks @redhatrises !

@redhatrises redhatrises deleted the fix_version branch July 17, 2018 16:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants