Update build scripts to fetch new changes.

Prevent future mistakes when creating tags by always fetching the branch
head before bumping version numbers or creating tags.
This commit is contained in:
mark_story 2013-06-24 22:01:59 -04:00
parent b73f927787
commit cd7d18de68

View file

@ -164,6 +164,17 @@
<move file="${build.dir}/${pear.package}/${pear.package}.tgz" todir="${dist.dir}" /> <move file="${build.dir}/${pear.package}/${pear.package}.tgz" todir="${dist.dir}" />
</target> </target>
<!--
Updates the local copy to the latest head.
-->
<target name="update-branch">
<echo msg="Updating to latest master." />
<exec executable="git pull">
<arg value="${git.remote}" />
<arg value="master" />
</exec>
</target>
<!-- <!--
Bump the version number and commit that. Bump the version number and commit that.
--> -->
@ -182,7 +193,7 @@
<!-- <!--
Create the release commit that updates the version number and pushes the commits. Create the release commit that updates the version number and pushes the commits.
--> -->
<target name="release-commit" depends="next-version,prepare"> <target name="release-commit" depends="update-branch,next-version,prepare">
<echo msg="Creating new release commit" /> <echo msg="Creating new release commit" />
<exec command="git add ./lib/Cake/VERSION.txt" logoutput="true" checkreturn="true" /> <exec command="git add ./lib/Cake/VERSION.txt" logoutput="true" checkreturn="true" />
<exec command="git commit -m 'Update version number to ${release_version}'" logoutput="true" checkreturn="true" /> <exec command="git commit -m 'Update version number to ${release_version}'" logoutput="true" checkreturn="true" />