Skip to content

Commit

Permalink
Merge pull request #782 from kenjis/update-RELEASE.md
Browse files Browse the repository at this point in the history
docs: update RELEASE.md
  • Loading branch information
kenjis authored Aug 15, 2023
2 parents 2d0ec09 + c0e067d commit 89549c3
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion admin/RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,17 @@ the changelog.
* Watch for the "docs" action and verify that the user guide updated:
* [docs](https://github.com/codeigniter4/shield/actions/workflows/docs.yml)
* Fast-forward `develop` branch to catch the merge commit from `master`
(note: pushing to develop is restricted to administrators):
(note: pushing to `develop` is restricted to administrators):
```console
git fetch origin
git checkout develop
git merge origin/develop
git merge origin/master
git push origin HEAD # Only administrators can push to the protected branch.
```
**At this point, `master` must be merged into `develop`.** Otherwise, the
GitHub-generated release note from `develop` for the next release will not be
generated correctly.
* Publish any Security Advisories that were resolved from private forks
(note: publishing is restricted to administrators)
* Announce the release on the forums and Slack channel
Expand Down

0 comments on commit 89549c3

Please sign in to comment.