diff options
| author | Reinier Zwitserloot <reinier@zwitserloot.com> | 2018-09-10 22:24:42 +0200 |
|---|---|---|
| committer | Reinier Zwitserloot <reinier@zwitserloot.com> | 2018-09-10 22:24:48 +0200 |
| commit | 7319256a37b1ca78d6ff736e3db2caaf59b55e68 (patch) | |
| tree | 61f697f62301e21f1312c8a3731d5cf3072ac729 /buildScripts/website.ant.xml | |
| parent | 6a42bccb9730b7072b1219a03642074ab96fbe61 (diff) | |
| download | lombok-7319256a37b1ca78d6ff736e3db2caaf59b55e68.tar.gz lombok-7319256a37b1ca78d6ff736e3db2caaf59b55e68.tar.bz2 lombok-7319256a37b1ca78d6ff736e3db2caaf59b55e68.zip | |
[website] some work on releasing edge and updating git.
Diffstat (limited to 'buildScripts/website.ant.xml')
| -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> |