diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-03-04 22:29:28 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-12-03 14:23:34 +0100 |
| commit | 9f3b151dabd9cfeefd40c89c79c9e57ca5354bae (patch) | |
| tree | 430e54aa7217acbc198363c1dd41cd0bf7e1ccf3 /build/build.xml | |
| parent | dee5e6e07636db7e35a82919a723907e734fbcd1 (diff) | |
| download | forums-9f3b151dabd9cfeefd40c89c79c9e57ca5354bae.tar forums-9f3b151dabd9cfeefd40c89c79c9e57ca5354bae.tar.gz forums-9f3b151dabd9cfeefd40c89c79c9e57ca5354bae.tar.bz2 forums-9f3b151dabd9cfeefd40c89c79c9e57ca5354bae.tar.xz forums-9f3b151dabd9cfeefd40c89c79c9e57ca5354bae.zip | |
[ticket/14492] Checkout master if viglink tag does not exist for latest version
PHPBB3-14492
Diffstat (limited to 'build/build.xml')
| -rw-r--r-- | build/build.xml | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/build/build.xml b/build/build.xml index ab7085eda6..69ecaa896c 100644 --- a/build/build.xml +++ b/build/build.xml @@ -142,6 +142,7 @@ <phingcall target="export"> <property name="revision" value="release-${version}" /> + <property name="version" value="${version}" /> <property name="dir" value="build/old_versions/release-${version}" /> <property name="skip-composer" value="true" /> </phingcall> @@ -308,7 +309,18 @@ <if> <equals arg1="${revision}" arg2="HEAD" trim="true" /> <then> - <exec dir="${dir}/ext/phpbb/viglink" command="git checkout master" passthru="true" /> + <exec dir="${dir}/ext/phpbb/viglink" + command="git rev-parse release-phpbb-${version}" + returnProperty='viglink_head_tag_exists' /> + <if> + <equals arg1="${viglink_head_tag_exists}" arg2="0" trim="true" /> + <then> + <exec dir="${dir}/ext/phpbb/viglink" command="git checkout release-phpbb-${version}" passthru="true" /> + </then> + <else> + <exec dir="${dir}/ext/phpbb/viglink" command="git checkout master" passthru="true" /> + </else> + </if> </then> <else> <exec dir="${dir}/ext/phpbb/viglink" command="git checkout release-phpbb-${version}" passthru="true" /> |