Skip to content

Commit d542039

Browse files
author
David Marginian
committed
Addressing mike's comment
1 parent a11f0b6 commit d542039

File tree

1 file changed

+16
-12
lines changed

1 file changed

+16
-12
lines changed

build.xml

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,9 @@
2929

3030
<!-- Get build number from Github CI -->
3131
<property environment="envgithub"/>
32-
33-
<!-- Updates version-properties with a build number if this is a CI run -->
34-
<target name="updateVersionPropertiesWithBuildNumber">
35-
<if>
36-
<isset property="envgithub.GITHUB_RUN_ID" />
37-
<then>
38-
<propertyfile file="${target.root}/classes/main/dwr-version.properties">
39-
<entry key="build.number" value="${envgithub.GITHUB_RUN_ID}" />
40-
</propertyfile>
41-
</then>
42-
</if>
43-
</target>
32+
<condition property="build.number" value="${envgithub.GITHUB_RUN_ID}">
33+
<isset property="envgithub.GITHUB_RUN_ID" />
34+
</condition>
4435

4536
<target name="init">
4637
<mkdir dir="${build}" />
@@ -90,10 +81,23 @@
9081
<replace casesensitive="false" file="target/pom.xml" token="{version}" value="${version}" />
9182
</target>
9283

84+
<!-- Updates the build number in dwr-version.properties with the build number from CI -->
85+
<target name="updateVersionPropertiesWithBuildNumber" description="Update dwr-version.properties with CI build number.">
86+
<if>
87+
<isset property="build.number" />
88+
<then>
89+
<propertyfile file="${target.root}/classes/main/dwr-version.properties">
90+
<entry key="build.number" value="${build.number}" />
91+
</propertyfile>
92+
</then>
93+
</if>
94+
</target>
95+
9396
<!--=======================================================================-->
9497
<target name="jar" depends="prepare, source" description="Create dwr.jar">
9598
<build target="${target.root}" include="" modules="${modules}" />
9699
<antcall target="setVersionInPom" />
100+
<antcall target="updateVersionPropertiesWithBuildNumber" />
97101
<jar destfile="${target.root}/dwr.jar" compress="true">
98102
<fileset dir="${target.root}/classes/main" />
99103
</jar>

0 commit comments

Comments
 (0)