Perform version override earlier and only on teamcity
This commit is contained in:
@@ -187,6 +187,8 @@
|
|||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="fetch-third-party" depends="make-dependency-dirs, make-native-platform-uberjar, fetch-idea-artifacts-for-compiler-tests">
|
<target name="fetch-third-party" depends="make-dependency-dirs, make-native-platform-uberjar, fetch-idea-artifacts-for-compiler-tests">
|
||||||
|
<antcall target="override-version"/>
|
||||||
|
|
||||||
<!-- ProGuard -->
|
<!-- ProGuard -->
|
||||||
<get-maven-library prefix="net/sf/proguard" lib="proguard-base" version="5.1" target.jar.name.base="proguard" src="false"/>
|
<get-maven-library prefix="net/sf/proguard" lib="proguard-base" version="5.1" target.jar.name.base="proguard" src="false"/>
|
||||||
<get-maven-library prefix="net/sf/proguard" lib="proguard-anttask" version="5.1" target.jar.name.base="proguard-anttask" src="false"/>
|
<get-maven-library prefix="net/sf/proguard" lib="proguard-anttask" version="5.1" target.jar.name.base="proguard-anttask" src="false"/>
|
||||||
@@ -322,8 +324,6 @@
|
|||||||
<arg line="-name 'kotlin*' ! -name '*.bat' -exec chmod a+x '{}' ;"/>
|
<arg line="-name 'kotlin*' ! -name '*.bat' -exec chmod a+x '{}' ;"/>
|
||||||
</exec>
|
</exec>
|
||||||
|
|
||||||
<antcall target="override-version"/>
|
|
||||||
|
|
||||||
<download-or-build-markdown-parser/>
|
<download-or-build-markdown-parser/>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
@@ -947,6 +947,7 @@
|
|||||||
<not>
|
<not>
|
||||||
<istrue value="${bootstrap.build.no.tests}"/>
|
<istrue value="${bootstrap.build.no.tests}"/>
|
||||||
</not>
|
</not>
|
||||||
|
<isset property="teamcity.version"/>
|
||||||
</and>
|
</and>
|
||||||
</condition>
|
</condition>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user