-
Notifications
You must be signed in to change notification settings - Fork 8k
Remove language for recreating tags (which is dangerous), and using patch levels (which isn't standard practise). #19367
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
derickr
wants to merge
1
commit into
php:master
Choose a base branch
from
derickr:release-process
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+6
−40
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -829,53 +829,19 @@ slightly different steps. We'll call attention where the steps differ. | |||||||||||||||
| for posting the release announcement to Mastodon. Posts need to be | ||||||||||||||||
| approved. | ||||||||||||||||
|
|
||||||||||||||||
| ## Re-releasing the same version or a patch-level (i.e., `-plN`) | ||||||||||||||||
| ## Re-releasing the same version | ||||||||||||||||
|
|
||||||||||||||||
| While unlikely, there may be times we need to re-release the same version. This | ||||||||||||||||
| might happen if the tarballs have a corrupted file, for example. | ||||||||||||||||
|
|
||||||||||||||||
| Should this occur *before* announcing the release, you may choose to delete the | ||||||||||||||||
| tag and go through the full packaging process again, as described above. | ||||||||||||||||
| might happen if the tarballs have a corrupted file, for example, or when there | ||||||||||||||||
| is a build error. | ||||||||||||||||
|
|
||||||||||||||||
| > 💬 **Hint** \ | ||||||||||||||||
| > This is one of the reasons we package releases two days before announcing | ||||||||||||||||
| > them. | ||||||||||||||||
|
|
||||||||||||||||
| If this happens *after* announcing the release, you may choose to tag, package, | ||||||||||||||||
| and release a patch-level (i.e., *pl*) release. If it is not critical and/or | ||||||||||||||||
| affects a very limited subset of users, then you may choose to wait until the | ||||||||||||||||
| next release. | ||||||||||||||||
|
|
||||||||||||||||
| If you choose to create a patch-level release, follow these steps: | ||||||||||||||||
|
|
||||||||||||||||
| 1. Commit the new binaries to `web-php-distributions` | ||||||||||||||||
|
|
||||||||||||||||
| 2. Update $data['X.Y'] in `web-php:/include/version.inc` | ||||||||||||||||
| (X.Y=major.minor release, e.g. '8.0'): | ||||||||||||||||
|
|
||||||||||||||||
| * `version` to the full version number (e.g. '8.0.1-pl1') | ||||||||||||||||
| * `date` to the release date in `j M Y` format (e.g. '9 Jan 2021') | ||||||||||||||||
| * `tags` array should include `security` if this is a security release | ||||||||||||||||
| * `sha256` array and sub-elements for all SHA256 sums | ||||||||||||||||
|
|
||||||||||||||||
| 3. Add a short notice to `web-php` stating that there is a new release, and | ||||||||||||||||
| highlight the major important things (security fixes) and when it is | ||||||||||||||||
| important to upgrade. | ||||||||||||||||
|
|
||||||||||||||||
| * Call `php bin/createReleaseEntry -v <version> [ --security ]` in your | ||||||||||||||||
| local web-php checkout. | ||||||||||||||||
|
|
||||||||||||||||
| 4. Commit all the changes (`include/version.inc`, `archive/archive.xml`, | ||||||||||||||||
| `archive/entries/YYYY-MM-DD-N.xml`). | ||||||||||||||||
|
|
||||||||||||||||
| 5. Wait an hour or two, then send a mail to php-announce@lists.php.net, | ||||||||||||||||
| php-general@lists.php.net and internals@lists.php.net with a text similar to | ||||||||||||||||
| the news entry. | ||||||||||||||||
|
|
||||||||||||||||
| Please make sure that the mail to php-announce@ is its own completely | ||||||||||||||||
| separate email. This is to make sure that replies to the announcement on | ||||||||||||||||
| php-general@ or internals@ will not accidentally hit the php-announce@ | ||||||||||||||||
| mailinglist. | ||||||||||||||||
| You *must not* delete and recreate a pushed tag. Instead, you need to go | ||||||||||||||||
| through the full packaging process again, as described above, whilst increasing | ||||||||||||||||
| the version number. This is unfortunate, but published tags must be immutable. | ||||||||||||||||
|
Comment on lines
+842
to
+844
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Optional suggestion, avoiding the very BE "whilst" |
||||||||||||||||
|
|
||||||||||||||||
|
|
||||||||||||||||
| ## Soft feature freeze | ||||||||||||||||
|
|
||||||||||||||||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Optional suggestion for rewording: