Create special parameter for branch version auto-increment
Can be used when bootstrap branch differs from the one used for auto-increment. Auto-increment is guarded by branch parameter to avoid accidental enabling after branches auto-merge. (cherry picked from commit 46791a3)
This commit is contained in:
committed by
Nikolay Krasko
parent
019ba77e2b
commit
c70e9a6702
@@ -21,7 +21,8 @@
|
||||
|
||||
<!-- Uncomment to enable force version increment in branch. Set override.version.disabled to temporary disable feature without commits -->
|
||||
<!--
|
||||
<property name="override.version.url" value="https://teamcity.jetbrains.com/guestAuth/app/rest/builds/?locator=buildType:bt345,count:1${kotlin.bootstrap.branch.locator}"/>
|
||||
<property name="override.version.branch" value="${kotlin.bootstrap.branch.locator}"/>
|
||||
<property name="override.version.url" value="https://teamcity.jetbrains.com/guestAuth/app/rest/builds/?locator=buildType:bt345,count:1,branch:${override.version.branch}"/>
|
||||
-->
|
||||
<!--<property name="override.version.disabled" value="true"/>-->
|
||||
|
||||
@@ -971,7 +972,7 @@
|
||||
<condition property="need.version.override">
|
||||
<and>
|
||||
<isset property="override.version.url"/>
|
||||
<equals arg1="${kotlin.bootstrap.branch}" arg2="${teamcity.build.branch}"/>
|
||||
<equals arg1="${override.version.branch}" arg2="${teamcity.build.branch}"/>
|
||||
<not>
|
||||
<isset property="override.version.disabled"/>
|
||||
</not>
|
||||
|
||||
Reference in New Issue
Block a user