Skip to content

Commit

Permalink
Handle situations where git is not available, like gzipped -src artifact
Browse files Browse the repository at this point in the history
  • Loading branch information
aratno committed Aug 18, 2022
1 parent 67d591d commit 843a835
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions .build/build-git.xml
Expand Up @@ -19,7 +19,17 @@
<project basedir="." name="apache-cassandra-git-tasks"
xmlns:if="ant:if">
<target name="get-git-sha">
<exec executable="git" osfamily="unix" dir="${basedir}" logError="true" failonerror="false" failifexecutionfails="false">
<exec executable="git" osfamily="unix" dir="${basedir}" logError="false" failonerror="false" failifexecutionfails="false" resultproperty="git.is-available.exit-code">
<arg value="rev-parse"/>
<arg value="--is-inside-work-tree"/>
<redirector outputproperty="git.is-available.output"/>
</exec>
<condition property="git.is-available" else="false">
<equals arg1="${git.is-available.exit-code}" arg2="0"/>
</condition>
<echo message="git.is-available=${git.is-available}"/>

<exec if:true="${git.is-available}" executable="git" osfamily="unix" dir="${basedir}" logError="true" failonerror="false" failifexecutionfails="false">
<arg value="describe"/>
<arg value="--match=''"/>
<arg value="--always"/>
Expand All @@ -30,7 +40,7 @@
<property name="git.sha" value="Unknown"/>
<echo level="info">git.sha=${git.sha}</echo>

<exec executable="git" osfamily="unix" dir="${basedir}" logError="true" failonerror="false" failifexecutionfails="false">
<exec if:true="${git.is-available}" executable="git" osfamily="unix" dir="${basedir}" logError="true" failonerror="false" failifexecutionfails="false">
<arg value="diff"/>
<arg value="--stat"/>
<redirector outputproperty="git.diffstat"/>
Expand Down

0 comments on commit 843a835

Please sign in to comment.