Browse Source

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.
mark_story 12 years ago
parent
commit
cd7d18de68
1 changed files with 12 additions and 1 deletions
  1. 12 1
      build.xml

+ 12 - 1
build.xml

@@ -165,6 +165,17 @@
 	</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.
 	-->
 	<target name="next-version" depends="current-version">
@@ -182,7 +193,7 @@
 	<!--
 		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" />
 		<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" />