The develop
branch is the development branch which means it contains the next version to be released. stable
contains the current latest release and master
contains the corresponding stable development version. Always work on the develop
branch and open up PRs against develop
.
- Branch: Starting from
develop
, cut a release branch namedrelease/X.Y.Z
for your changes. - Version bump: Bump the version number in
ever-blocks.php
andreadme.txt
if it does not already reflect the version being released. - Changelog: Add/update the changelog in both
readme.txt
andCHANGELOG.md
. - Props: Update
CREDITS.md
file with any new contributors, confirm maintainers are accurate. - Readme updates: Make any other readme changes as necessary.
README.md
is geared toward GitHub andreadme.txt
contains WordPress.org-specific content. The two are slightly different. - New files: Check to be sure any new files/paths that are unnecessary in the production version are included in
.gitattributes
. - Merge: Make a non-fast-forward merge from your release branch to
develop
(or merge the pull request), then do the same fordevelop
intotrunk
(git checkout trunk && git merge --no-ff develop
).trunk
contains the stable development version. - Test: While still on the
trunk
branch, test for functionality locally. - Push: Push your
trunk
branch to GitHub (e.g.git push origin trunk
). - Release: Create a new release, naming the tag and the release with the new version number, and targeting the
trunk
branch. Paste the changelog fromCHANGELOG.md
into the body of the release and include a link to the closed issues on the milestone. - SVN: Wait for the GitHub Action to finish deploying to the WordPress.org repository. If all goes well, users with SVN commit access for that plugin will receive an emailed diff of changes.
- Check WordPress.org: Ensure that the changes are live on https://wordpress.org/plugins/ever-blocks/. This may take a few minutes.
- Close milestone: Edit the X.Y.Z milestone with release date (in the
Due date (optional)
field) and link to GitHub release (in theDescription
field), then close the milestone. - Punt incomplete items: If any open issues or PRs which were milestoned for
X.Y.Z
do not make it into the release, update their milestone toX.Y.Z+1
,X.Y+1.0
,X+1.0.0
orFuture Release
.