Skip to content

Commit 5a6436f

Browse files
committed
[ci skip] Update RM documentation with latest notes
1 parent e2aa1fb commit 5a6436f

File tree

1 file changed

+29
-18
lines changed

1 file changed

+29
-18
lines changed

docs/release-process.md

+29-18
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,15 @@ explained at the end of this document in
9292
./buildconf --force \
9393
&& ./configure --enable-zts --disable-all --enable-debug --enable-opcache --enable-opcache-jit \
9494
&& make -j$(nproc) \
95-
&& make test TEST_PHP_ARGS=-j$(nproc) \
95+
&& make test TEST_PHP_ARGS="-q -j$(nproc)" \
9696
&& ./sapi/cli/php -v
9797

9898
# Without ZTS
9999
make distclean || \
100100
./buildconf --force \
101101
&& ./configure --disable-all --enable-debug --enable-opcache --enable-opcache-jit \
102102
&& make -j$(nproc) \
103-
&& make test TEST_PHP_ARGS=-j$(nproc) \
103+
&& make test TEST_PHP_ARGS="-q -j$(nproc)" \
104104
&& ./sapi/cli/php -v
105105
```
106106

@@ -115,7 +115,7 @@ explained at the end of this document in
115115
8. Tag the repository release branch with the version, e.g.:
116116

117117
```sh
118-
git tag -u YOURKEYID php-7.4.2RC2
118+
git tag -u YOURKEYID php-7.4.2RC2 -m "Tag for php-7.4.2RC2"
119119
```
120120

121121
9. Bump the version numbers in `main/php_version.h`, `Zend/zend.h`,
@@ -131,26 +131,33 @@ explained at the end of this document in
131131
(a local temporary branch should be used).
132132
133133
```sh
134-
git push --tags origin HEAD
134+
git push origin {tag name}
135135
git push origin {main branch}
136136
git push origin {release branch}
137137
```
138138
139+
Do not push with `--tags`, as this will push all local tags, including tags
140+
you might not wish to push.
141+
139142
11. Run: `./scripts/dev/makedist php-7.4.0RC2`, this will export the tree,
140143
create `configure` and build three tarballs (gz, bz2 and xz).
141144
142-
12. Run `./scripts/dev/gen_verify_stub <version> [identity]`, this will sign the
143-
tarballs and output verification information to be included in announcement
144-
email.
145+
12. Run `./scripts/dev/gen_verify_stub <version> [GPG identity] > <version>.manifest`,
146+
this will sign the tarballs and save the signatures to `<version>.manifest`,
147+
so you can include them in the announcement email.
148+
149+
13. If you have the [GitHub command line tool](https://cli.github.com) installed,
150+
run `gh gist create --public <version>.manifest` to create a public Gist for
151+
the manifest file, or go to https://gist.github.com to create one manually.
145152
146-
13. Copy those tarballs (scp, rsync) to downloads.php.net, in your homedir there
153+
14. Copy those tarballs (scp, rsync) to downloads.php.net, in your homedir there
147154
should be a directory `public_html/`. Copy them into there. If you do not
148155
have this directory, create it.
149156
150-
14. Now the RC can be found on https://downloads.php.net/~yourname,
157+
15. Now the RC can be found on https://downloads.php.net/~yourname,
151158
e.g. https://downloads.php.net/~derick/.
152159
153-
15. Once the release has been tagged, contact the release-managers@ distribution
160+
16. Once the release has been tagged, contact the release-managers@ distribution
154161
list so that Windows binaries can be created. Once those are made, they can
155162
be found at https://windows.php.net/download.
156163
@@ -235,21 +242,21 @@ explained at the end of this document in
235242
./buildconf --force \
236243
&& ./configure --enable-zts --disable-all --enable-debug --enable-opcache --enable-opcache-jit \
237244
&& make -j$(nproc) \
238-
&& make test TEST_PHP_ARGS=-j$(nproc) \
245+
&& make test TEST_PHP_ARGS="-q -j$(nproc)" \
239246
&& ./sapi/cli/php -v
240247

241248
# Without ZTS
242249
make distclean || \
243250
./buildconf --force \
244251
&& ./configure --disable-all --enable-debug --enable-opcache --enable-opcache-jit \
245252
&& make -j$(nproc) \
246-
&& make test TEST_PHP_ARGS=-j$(nproc) \
253+
&& make test TEST_PHP_ARGS="-q -j$(nproc)" \
247254
&& ./sapi/cli/php -v
248255
```
249256
250257
6. Check `./sapi/cli/php -v` output for version matching.
251258
252-
7. Tag the repository with the version e.g. `git tag -u YOURKEYID php-7.4.1`
259+
7. Tag the repository with the version e.g. `git tag -u YOURKEYID php-7.4.1 -m "Tag for php 7.4.1"`
253260
254261
8. Push the tag e.g. `git push origin php-7.4.1`.
255262
@@ -262,11 +269,15 @@ explained at the end of this document in
262269
be influenced by defining the environment variable
263270
`TAR_OPTIONS='--format=gnu'`.
264271
265-
10. Run `scripts/dev/gen_verify_stub <version> [identity]`, this will sign the
266-
tarballs and output verification information to be included in announcement
267-
email.
272+
10. Run `./scripts/dev/gen_verify_stub <version> [GPG identity] > <version>.manifest`,
273+
this will sign the tarballs and save the signatures to `<version>.manifest`,
274+
so you can include them in the announcement email.
275+
276+
11. If you have the [GitHub command line tool](https://cli.github.com) installed,
277+
run `gh gist create --public <version>.manifest` to create a public Gist for
278+
the manifest file, or go to https://gist.github.com to create one manually.
268279
269-
11. Commit and push all the tarballs and signature files to
280+
12. Commit and push all the tarballs and signature files to
270281
`web-php-distributions`, then update the git submodule reference in
271282
`web-php`:
272283
@@ -285,7 +296,7 @@ explained at the end of this document in
285296
This is to fetch the last commit id from `web-php-distributions` and commit
286297
this last commit id to `web-php`, then, website will now sync.
287298
288-
12. Once the release has been tagged, contact release managers, Windows
299+
13. Once the release has been tagged, contact release managers, Windows
289300
builders, and package maintainers so that they can build releases. Do not
290301
send this announcement to any public lists.
291302

0 commit comments

Comments
 (0)