Skip to content

Commit

Permalink
Merge pull request #146 from muryanto1/fix_build
Browse files Browse the repository at this point in the history
use 'git describe --tags' in build.xml
  • Loading branch information
sashakames authored Aug 26, 2020
2 parents 8649f77 + 331ed29 commit 68ceb98
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -97,15 +97,15 @@ Builds the project via ant (obviously).

<exec executable="bash" dir="${basedir}" outputproperty="version_num">
<arg value="-c"/>
<arg value="git describe | sed -n 's/v[.]*\([a-zA-Z0-9.]*\)[-]*.*/\1/p'"/>
<arg value="git describe --tags"/>
</exec>
<exec executable="bash" dir="${basedir}" outputproperty="branch">
<arg value="-c"/>
<arg value="git branch | grep '*' | sed -n 's/\*[ ]*//p'"/>
</exec>
<exec executable="bash" dir="${basedir}" outputproperty="commit">
<arg value="-c"/>
<arg value="git describe"/>
<arg value="git describe --tags"/>
</exec>
<exec executable="bash" dir="${basedir}" outputproperty="release_name">
<arg value="-c"/>
Expand Down

0 comments on commit 68ceb98

Please sign in to comment.