Skip to content

Commit cd7d18d

Browse files
committed
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.
1 parent b73f927 commit cd7d18d

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

build.xml

+12-1
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,17 @@
164164
<move file="${build.dir}/${pear.package}/${pear.package}.tgz" todir="${dist.dir}" />
165165
</target>
166166

167+
<!--
168+
Updates the local copy to the latest head.
169+
-->
170+
<target name="update-branch">
171+
<echo msg="Updating to latest master." />
172+
<exec executable="git pull">
173+
<arg value="${git.remote}" />
174+
<arg value="master" />
175+
</exec>
176+
</target>
177+
167178
<!--
168179
Bump the version number and commit that.
169180
-->
@@ -182,7 +193,7 @@
182193
<!--
183194
Create the release commit that updates the version number and pushes the commits.
184195
-->
185-
<target name="release-commit" depends="next-version,prepare">
196+
<target name="release-commit" depends="update-branch,next-version,prepare">
186197
<echo msg="Creating new release commit" />
187198
<exec command="git add ./lib/Cake/VERSION.txt" logoutput="true" checkreturn="true" />
188199
<exec command="git commit -m 'Update version number to ${release_version}'" logoutput="true" checkreturn="true" />

0 commit comments

Comments
 (0)