Skip to content

Commit f014785

Browse files
committed
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: fix some factual errors in the process
2 parents 2955993 + 61ad5e2 commit f014785

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

README.RELEASE_PROCESS

+7-6
Original file line numberDiff line numberDiff line change
@@ -196,11 +196,11 @@ last commit id to web/php.git, then, mirrors will now sync
196196
Getting the stable release announced
197197
------------------------------------
198198

199-
1. Run the bumpRelease script for phpweb on your local checkout
199+
1. Update phpweb/include/releases.inc with the old release info
200+
(updates the download archives)
200201

201-
a. ``php bin/bumpRelease 5`` to create the release file (releases/x_y_z.php)
202-
The release announcement file should list in detail security fixes and
203-
changes in behavior (whether due to a bug fix or not).
202+
a. You can run ``php bin/bumpRelease 5`` if you are making a release for the
203+
highest branch, otherwise you have to do this manually, see point 1.b
204204

205205
b. In case multiple PHP minor versions are in active development you have
206206
to manually copy the old information to include/releases.inc
@@ -220,8 +220,9 @@ Getting the stable release announced
220220

221221
f. if the windows builds aren't ready yet prefix the "windows" key with a dot (".windows")
222222

223-
3. Update phpweb/include/releases.php with the old release info
224-
(updates the download archives)
223+
3. Create the release file (releases/x_y_z.php)
224+
Usually we use the same content as for point 6, but included in php template
225+
instead of the release xml.
225226

226227
4. Update php-qa/include/release-qa.php and add the next version as an QARELEASE
227228
(prepare for next RC)

0 commit comments

Comments
 (0)