diff options
| -rw-r--r-- | buildScripts/website.ant.xml | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/buildScripts/website.ant.xml b/buildScripts/website.ant.xml index ddcb2219..f7a86fd4 100644 --- a/buildScripts/website.ant.xml +++ b/buildScripts/website.ant.xml @@ -209,15 +209,22 @@ such as applying the templates to produce the website, converting the changelog username="${ssh.username}" keyfile="${ssh.keyfile}" knownHosts="ssh.knownHosts" /> + <exec executable="/usr/bin/git" failonerror="true"> + <arg value="merge-base" /> + <arg value="--is-ancestor" /> + <arg value="edge" /> + <arg value="master" /> + </exec> <exec executable="/usr/bin/git"> - <arg value="tag" /> + <arg value="branch" /> <arg value="-f" /> - <arg value="live" /> + <arg value="edge" /> + <arg value="master" /> </exec> <exec executable="/usr/bin/git"> <arg value="push" /> - <arg value="-f" /> - <arg value="--tags" /> + <arg value="origin" /> + <arg value="edge:refs/heads/edge" /> </exec> </target> |