You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2018/01/04 23:56:05 UTC
[royale-asjs] 01/03: more fixes for rc script
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit ed085d18ab0c06f02802f00fa7d57570188475c8
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Jan 4 15:55:08 2018 -0800
more fixes for rc script
---
releasecandidate.xml | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/releasecandidate.xml b/releasecandidate.xml
index 828d7d3..c44e9ac 100644
--- a/releasecandidate.xml
+++ b/releasecandidate.xml
@@ -482,12 +482,16 @@
</target>
<target name="git-commit-and-push-typedefs">
- <exec executable="${git}" dir="${typedefs}" failonerror="true" outputproperty="git.status.typedefs">
+ <exec executable="${git}" dir="${typedefs}" failonerror="true">
+ <arg value="remote" />
+ <arg value="-v" />
+ </exec>
+ <exec executable="${git}" dir="${typedefs}" failonerror="true" outputproperty="git.push.status.typedefs">
<arg value="status" />
</exec>
- <echo>${git.status.typedefs}</echo>
+ <echo>${git.push.status.typedefs}</echo>
<condition property="typedefs.modification.exists">
- <contains string="${git.status.typedefs}" substring="modified:" />
+ <contains string="${git.push.status.typedefs}" substring="modified:" />
</condition>
<antcall target="git-commit-and-push-typedefs-if-modified" />
</target>
@@ -505,11 +509,11 @@
</target>
<target name="git-commit-and-push-asjs">
- <exec executable="${git}" dir="${asjs}" failonerror="true" outputproperty="git.status.asjs">
+ <exec executable="${git}" dir="${asjs}" failonerror="true" outputproperty="git.push.status.asjs">
<arg value="status" />
</exec>
<condition property="asjs.modification.exists">
- <contains string="${git.status.asjs}" substring="modified:" />
+ <contains string="${git.push.status.asjs}" substring="modified:" />
</condition>
<antcall target="git-commit-and-push-asjs-if-modified" />
</target>
--
To stop receiving notification emails like this one, please contact
"commits@royale.apache.org" <co...@royale.apache.org>.