7.1 KiB
Release Process
Documentation guide based on the releases of
4.0.5
and4.1.0
on January 31, 2021.Updated for
4.3.0
on January 10, 2023.-MGatner, kenjis
[Minor version only] Merge minor version branch into develop
If you release a new minor version.
- Create PR to merge
4.x
intodevelop
and merge it - Delete the merged
4.x
branch (This closes all PRs to the branch) - Do the regular release process. Go to the next "Changelog" section
Changelog
When generating the changelog each Pull Request to be included must have one of the following labels:
- bug ... PRs that fix bugs
- enhancement ... PRs to improve existing functionalities
- new feature ... PRs for new features
- refactor ... PRs to refactor
PRs with breaking changes must have the following additional label:
- breaking change ... PRs that may break existing functionalities
Generate Changelog
To auto-generate, navigate to the Releases page, click the "Draft a new release" button.
- Tag: "v4.x.x" (Create new tag)
- Target: develop
Click the "Generate release notes" button.
Check the resulting content. If there are items in the Others section which should be included in the changelog, add a label to the PR and regenerate the changelog.
Copy the resulting content into CHANGELOG.md and adjust the format to match the existing content.
Preparation
- Work off direct clones of the repos so the release branches persist for a time
- Clone both codeigniter4/CodeIgniter4 and codeigniter4/userguide and resolve any necessary PRs
git clone git@github.com:codeigniter4/CodeIgniter4.git
git clone git@github.com:codeigniter4/userguide.git
- Vet the admin/ folders for any removed hidden files (Action deploy scripts do not remove these)
- Merge any Security Advisory PRs in private forks
Process
Note: Most changes that need noting in the User Guide and docs should have been included with their PR, so this process assumes you will not be generating much new content.
- Create a new branch
release-4.x.x
- Update system/CodeIgniter.php with the new version number:
const CI_VERSION = '4.x.x';
- Update user_guide_src/source/conf.py with the new
version = '4.x'
(if applicable) andrelease = '4.x.x'
- Replace CHANGELOG.md with the new version generated above
- Set the date in user_guide_src/source/changelogs/{version}.rst to format
Release Date: January 31, 2021
- Create a new changelog for the next version at user_guide_src/source/changelogs/{next_version}.rst and add it to index.rst
- Create user_guide_src/source/installation/upgrade_{ver}.rst, fill in the "All Changes" section, and add it to upgrading.rst
- git diff --name-status master -- . ':!system'
- Commit the changes with "Prep for 4.x.x release" and push to origin
- Create a new PR from
release-4.x.x
todevelop
:- Title: "Prep for 4.x.x release"
- Decription: "Updates changelog and version references for
4.x.x
." (plus checklist)
- Let all tests run, then review and merge the PR
- Create a new PR from
develop
tomaster
:- Title: "4.x.x Ready code"
- Description: blank
- Merge the PR then create a new Release:
- Version: "v4.x.x"
- Target: master
- Title: "CodeIgniter 4.x.x"
- Description:
CodeIgniter 4.x.x release.
See the changelog: https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md
## New Contributors
*
- Watch for the "Deploy Distributable Repos" action to make sure framework, appstarter, and userguide get updated
- Run the following commands to install and test
appstarter
and verify the new version:
composer create-project codeigniter4/appstarter release-test
cd release-test
composer test && composer info codeigniter4/framework
- Verify that the user guide actions succeeded:
- "Deploy Distributable Repos", the main repo
- "Deploy Production", UG repo
- "pages-build-deployment", UG repo
- Fast-forward
develop
branch to catch the merge commit frommaster
git fetch origin
git checkout develop
git merge origin/develop
git merge origin/master
git push origin HEAD
- Update the next minor upgrade branch
4.x
:
git fetch origin
git checkout 4.x
git merge origin/4.x
git merge origin/develop
git push origin HEAD
- [Minor version only] Create the next minor upgrade branch
4.x
:
git fetch origin
git switch develop
git switch -c 4.x
git push origin HEAD
- Publish any Security Advisories that were resolved from private forks
- Announce the release on the forums and Slack channel (note: this forum is restricted to administrators):
- Make a new topic in the "News & Discussion" forums: https://forum.codeigniter.com/forum-2.html
- The content is somewhat organic, but should include any major features and changes as well as a link to the User Guide's changelog
After Publishing Security Advisory
- Send a PR to PHP Security Advisories Database.
- E.g. https://github.com/FriendsOfPHP/security-advisories/pull/606
- See https://github.com/FriendsOfPHP/security-advisories#contributing
- Don't forget to run
php -d memory_limit=-1 validator.php
, before submitting the PR
Appendix
Sphinx Installation
You may need to install Sphinx and its dependencies prior to building the User Guide. This worked seamlessly on Ubuntu 20.04:
sudo apt install python3-sphinx
sudo pip3 install sphinxcontrib-phpdomain
sudo pip3 install sphinx_rtd_theme
Manual User Guide Process
- Still in the CodeIgniter4 repo enter the user_guide_src directory
- Clear out any old build files:
rm -rf build/
- Build the HTML version of the User Guide:
make html
- Build the ePub version of the User Guide:
make epub
- Switch to the userguide repo and create a new branch
release-4.x.x
- Replace docs/ with CodeIgniter4/user_guide_src/build/html
- Ensure the file docs/.nojekyll exists or GitHub Pages will ignore folders with an underscore prefix
- Copy CodeIgniter4/user_guide_src/build/epub/CodeIgniter.epub to ./CodeIgniter4.x.x.epub
- Commit the changes with "Update for 4.x.x" and push to origin
- Create a new PR from
release-4.x.x
todevelop
:- Title: "Update for 4.x.x"
- Description: blank
- Merge the PR
- Create a new Release:
- Version: "v4.x.x"
- Title: "CodeIgniter 4.x.x User Guide"
- Description: "CodeIgniter 4.x.x User Guide"
- Watch for the "github pages" Environment to make sure the deployment succeeds
The User Guide website should update itself via the deploy GitHub Action. Should this fail the server must be updated manually. See repo and hosting details in the deploy script at the User Guide repo.