Skip to content

Commit b86accc

Browse files
committed
fix some issues
1 parent 9482e68 commit b86accc

File tree

1 file changed

+18
-22
lines changed

1 file changed

+18
-22
lines changed

docs/release-process.md

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ explained at the end of this document in
2626

2727
3. Ensure that the relevant tests on CI are green.
2828

29-
See:
30-
https://travis-ci.org/php/php-src/builds
29+
See:
30+
https://ci.appveyor.com/project/php/php-src
3131
https://dev.azure.com/phpazuredevops/PHP/
3232

3333
It is recommended to do so a couple of days before the packaging day, to
@@ -41,8 +41,7 @@ explained at the end of this document in
4141
4. Follow all steps to the letter. When unclear ask previous RM's before
4242
proceeding. Ideally make sure that for the first releases one of the
4343
previous RM's is around to answer questions. For the steps related to the
44-
php/QA/bug websites try to have someone from the webmaster team (Bjori) on
45-
hand.
44+
php/QA/bug websites try to have someone from the webmaster team on hand.
4645

4746
5. Verify the tags to be extra sure everything was tagged properly.
4847

@@ -57,18 +56,15 @@ explained at the end of this document in
5756

5857
## Packaging a non stable release (alpha/beta/RC)
5958

60-
1. Check Windows snapshot builder logs https://windows.php.net/downloads/snaps/
61-
the last revision.
59+
1. Check the tests at https://travis-ci.org/php/php-src/builds.
6260

63-
2. Check the tests at https://travis-ci.org/php/php-src/builds.
64-
65-
3. Run the `scripts/dev/credits` script in php-src and commit the changes in
61+
2. Run the `scripts/dev/credits` script in php-src and commit the changes in
6662
the credits files in ext/standard.
6763

68-
4. Checkout the release branch for this release (e.g., PHP-7.4.2) from the main
64+
3. Checkout the release branch for this release (e.g., PHP-7.4.2) from the main
6965
branch.
7066

71-
5. Bump the version numbers in `main/php_version.h`, `Zend/zend.h`,
67+
4. Bump the version numbers in `main/php_version.h`, `Zend/zend.h`,
7268
`configure.ac` and possibly `NEWS`. Do not use abbreviations for alpha and
7369
beta. Do not use dashes, you should `#define PHP_VERSION "7.4.22RC1"` and
7470
not `#define PHP_VERSION "7.4.22-RC1"`.
@@ -80,31 +76,31 @@ explained at the end of this document in
8076
need to be rebuilt with each bump. Do *not* bump the API versions after
8177
RC1.
8278

83-
6. Compile and run `make test`, with and without ZTS, using the right Bison and
79+
5. Compile and run `make test`, with and without ZTS, using the right Bison and
8480
re2c version (for PHP 7.4, minimum Bison 3.0.0 and re2c 0.13.4 are used).
8581

86-
7. Check `./sapi/cli/php -v` output for version matching.
82+
6. Check `./sapi/cli/php -v` output for version matching.
8783

88-
8. If all is right, commit the changes to the release branch:
84+
7. If all is right, commit the changes to the release branch:
8985

9086
```sh
9187
git commit -a
9288
```
9389

94-
9. Tag the repository release branch with the version, e.g.:
90+
8. Tag the repository release branch with the version, e.g.:
9591

9692
```sh
9793
git tag -u YOURKEYID php-7.4.2RC2
9894
```
9995

100-
10. Bump the version numbers in `main/php_version.h`, `Zend/zend.h`,
96+
9. Bump the version numbers in `main/php_version.h`, `Zend/zend.h`,
10197
`configure.ac` and `NEWS` in the *main* branch (PHP-7.4 for example) to
10298
prepare for the **next** version. For example, if the RC is "7.4.1RC1" then
10399
the new one should be `7.4.2-dev` - regardless if we get a new RC or not.
104100
This is to make sure `version_compare()` can correctly work. Commit the
105101
changes to the main branch.
106102
107-
11. Push the changes to the `php-src`.
103+
10. Push the changes to the `php-src`.
108104
109105
Non stable release branches don't need to be pushed
110106
(a local temporary branch should be used).
@@ -115,21 +111,21 @@ explained at the end of this document in
115111
git push origin {release branch}
116112
```
117113
118-
12. Run: `./scripts/dev/makedist php-7.4.0RC2`, this will export the tree,
114+
11. Run: `./scripts/dev/makedist php-7.4.0RC2`, this will export the tree,
119115
create `configure` and build three tarballs (gz, bz2 and xz).
120116
121-
13. Run `./scripts/dev/gen_verify_stub <version> [identity]`, this will sign the
117+
12. Run `./scripts/dev/gen_verify_stub <version> [identity]`, this will sign the
122118
tarballs and output verification information to be included in announcement
123119
email.
124120
125-
14. Copy those tarballs (scp, rsync) to downloads.php.net, in your homedir there
121+
13. Copy those tarballs (scp, rsync) to downloads.php.net, in your homedir there
126122
should be a directory `public_html/`. Copy them into there. If you do not
127123
have this directory, create it.
128124
129-
15. Now the RC can be found on https://downloads.php.net/~yourname,
125+
14. Now the RC can be found on https://downloads.php.net/~yourname,
130126
e.g. https://downloads.php.net/~derick/.
131127
132-
16. Once the release has been tagged, contact the release-managers@ distribution
128+
15. Once the release has been tagged, contact the release-managers@ distribution
133129
list so that Windows binaries can be created. Once those are made, they can
134130
be found at https://windows.php.net/download.
135131

0 commit comments

Comments
 (0)