You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2016/09/14 21:30:56 UTC
[06/30] git commit: [flex-asjs] [refs/heads/spark] - try to get
release script to honor tag
try to get release script to honor tag
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/7e667699
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/7e667699
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/7e667699
Branch: refs/heads/spark
Commit: 7e667699b038eb1e6be14dd99073c064aac7fc28
Parents: d4cd359
Author: Alex Harui <ah...@apache.org>
Authored: Sun Sep 4 07:12:21 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sun Sep 4 07:12:21 2016 -0700
----------------------------------------------------------------------
releasecandidate.xml | 35 ++++++++++++++++++++++++-----------
1 file changed, 24 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7e667699/releasecandidate.xml
----------------------------------------------------------------------
diff --git a/releasecandidate.xml b/releasecandidate.xml
index 20f468f..945d4d3 100644
--- a/releasecandidate.xml
+++ b/releasecandidate.xml
@@ -20,6 +20,7 @@
<project name="CreateFlexJSReleaseCandidate" default="main" basedir=".">
+ <!-- use -Dtag=<tag or commit hash> to build from other than the head -->
<!-- Required for OSX 10.6 / Snow Leopard Performance. -->
<!-- Java 7 on Mac requires OSX 10.7.3 or higher and is 64-bit only -->
@@ -202,12 +203,20 @@
classpathref="anttask.classpath"/>
</target>
+ <target name="checkout_tag" if="tag" >
+ <exec executable="${git}" dir="${basedir}" failonerror="true" >
+ <arg value="checkout" />
+ <arg value="${tag}" />
+ </exec>
+ </target>
+
<target name="main" depends="install-rat,credentials" description="Perform required release approval steps">
<antcall target="check-new-version" />
<exec executable="${git}" dir="${basedir}" failonerror="true" >
<arg value="pull" />
<arg value="--rebase" />
</exec>
+ <antcall target="checkout_tag" />
<antcall target="stage.rc" />
<antcall target="push.rc" />
</target>
@@ -255,21 +264,25 @@
<arg value="-m" />
<arg value="rc${rc} of Apache FlexJS ${release.version}" />
</exec>
- <exec executable="${git}" dir="${basedir}" failonerror="true" >
- <arg value="tag" />
- <arg value="-a" />
- <arg value="apache-flex-flexjs-${release.version}-rc${rc}" />
- <arg value="-m" />
- <arg value=""rc${rc} of apache-flex-flexjs-${release.version}"" />
- </exec>
- <exec executable="${git}" dir="${basedir}" failonerror="true" >
- <arg value="push" />
- <arg value="--tags" />
- </exec>
+ <antcall target="tag_release" />
<antcall target="update-installer-config" />
<antcall target="mail" />
</target>
+ <target name="tag_release" unless="tag" >
+ <exec executable="${git}" dir="${basedir}" failonerror="true" >
+ <arg value="tag" />
+ <arg value="-a" />
+ <arg value="apache-flex-flexjs-${release.version}-rc${rc}" />
+ <arg value="-m" />
+ <arg value=""rc${rc} of apache-flex-flexjs-${release.version}"" />
+ </exec>
+ <exec executable="${git}" dir="${basedir}" failonerror="true" >
+ <arg value="push" />
+ <arg value="--tags" />
+ </exec>
+ </target>
+
<target name="credentials" depends="get-username,get-password">
<echo>${apache.username}</echo>
<echo>${apache.password}</echo>