|
18 | 18 |
|
19 | 19 | ## Merge `develop` branch into next minor version branch `4.y` |
20 | 20 |
|
21 | | -Before starting release process, if there are commits in `develop` branch that |
| 21 | +Before starting the release process, if there are commits in `develop` branch that |
22 | 22 | are not merged into `4.y` branch, merge them. This is because if conflicts occur, |
23 | 23 | merging will take time. |
24 | 24 |
|
25 | | -```console |
26 | | -git fetch upstream |
27 | | -git switch 4.y |
28 | | -git merge upstream/4.y |
29 | | -git merge upstream/develop |
30 | | -git push upstream HEAD |
31 | | -``` |
| 25 | +* [ ] Merge `develop` into `4.y`: |
| 26 | + ```console |
| 27 | + git fetch upstream |
| 28 | + git switch 4.y |
| 29 | + git merge upstream/4.y |
| 30 | + git merge upstream/develop |
| 31 | + git push upstream HEAD |
| 32 | + ``` |
32 | 33 |
|
33 | 34 | ## [Minor version only] Merge minor version branch into `develop` |
34 | 35 |
|
@@ -118,16 +119,16 @@ the existing content. |
118 | 119 | * Create a new branch `release-4.x.x` |
119 | 120 | * Update **system/CodeIgniter.php** with the new version number: |
120 | 121 | `const CI_VERSION = '4.x.x';` |
121 | | - * Update **user_guide_src/source/conf.py** with the new `version = '4.x'` (if releasing |
122 | | - the minor version) and `release = '4.x.x'`. |
| 122 | + * Update **user_guide_src/source/conf.py** with the new `version = '4.x'` |
| 123 | + and `release = '4.x.x'`. |
123 | 124 | * Update **user_guide_src/source/changelogs/{version}.rst** |
124 | 125 | * Set the date to format `Release Date: January 31, 2021` |
125 | 126 | * Update **phpdoc.dist.xml** with the new `<title>CodeIgniter v4.x API</title>` |
126 | 127 | and `<version number="4.x.x">` |
127 | 128 | * Update **admin/starter/builds**: |
128 | 129 | * Set `define('LATEST_RELEASE', '^4.x')` |
129 | | - * Set `define('NEXT_MINOR', '4.y-dev')`. |
130 | | - * If the major version changes, you need to manually change to `define('NEXT_MINOR', '5.0-dev')`. |
| 130 | + * Set `define('NEXT_MINOR', '^4.y-dev')`. |
| 131 | + * If the major version changes, you need to manually change to `define('NEXT_MINOR', '^5.0-dev')`. |
131 | 132 | * Commit the changes with `Prep for 4.x.x release` |
132 | 133 | * [ ] Create a new PR from `release-4.x.x` to `develop`: |
133 | 134 | * Title: `Prep for 4.x.x release` |
@@ -234,26 +235,31 @@ sudo pip3 install sphinx_rtd_theme |
234 | 235 |
|
235 | 236 | ### Manual User Guide Process |
236 | 237 |
|
237 | | -* Still in the **CodeIgniter4** repo enter the **user_guide_src** directory |
238 | | -* Clear out any old build files: `rm -rf build/` |
239 | | -* Build the HTML version of the User Guide: `make html` |
240 | | -* Build the ePub version of the User Guide: `make epub` |
241 | | -* Switch to the **userguide** repo and create a new branch `release-4.x.x` |
242 | | -* Replace **docs/** with **CodeIgniter4/user_guide_src/build/html** |
243 | | -* Ensure the file **docs/.nojekyll** exists or GitHub Pages will ignore folders |
| 238 | +> [!NOTE] |
| 239 | +> This process is normally not needed. The "Deploy Distributable Repos" action |
| 240 | +> builds and deploys the User Guide automatically when a release is published. |
| 241 | +> Follow these steps only if the automatic deployment fails. |
| 242 | +
|
| 243 | +* [ ] Still in the **CodeIgniter4** repo enter the **user_guide_src** directory |
| 244 | +* [ ] Clear out any old build files: `rm -rf build/` |
| 245 | +* [ ] Build the HTML version of the User Guide: `make html` |
| 246 | +* [ ] Build the ePub version of the User Guide: `make epub` |
| 247 | +* [ ] Switch to the **userguide** repo and create a new branch `release-4.x.x` |
| 248 | +* [ ] Replace **docs/** with **CodeIgniter4/user_guide_src/build/html** |
| 249 | +* [ ] Ensure the file **docs/.nojekyll** exists or GitHub Pages will ignore folders |
244 | 250 | with an underscore prefix |
245 | | -* Copy **CodeIgniter4/user_guide_src/build/epub/CodeIgniter.epub** to |
| 251 | +* [ ] Copy **CodeIgniter4/user_guide_src/build/epub/CodeIgniter.epub** to |
246 | 252 | **./CodeIgniter4.x.x.epub** |
247 | | -* Commit the changes with "Update for 4.x.x" and push to origin |
248 | | -* Create a new PR from `release-4.x.x` to `develop`: |
| 253 | +* [ ] Commit the changes with "Update for 4.x.x" and push to origin |
| 254 | +* [ ] Create a new PR from `release-4.x.x` to `develop`: |
249 | 255 | * Title: "Update for 4.x.x" |
250 | 256 | * Description: blank |
251 | | -* Merge the PR |
252 | | -* Create a new Release: |
| 257 | +* [ ] Merge the PR |
| 258 | +* [ ] Create a new Release: |
253 | 259 | * Version: "v4.x.x" |
254 | 260 | * Title: "CodeIgniter 4.x.x User Guide" |
255 | 261 | * Description: "CodeIgniter 4.x.x User Guide" |
256 | | -* Watch for the "github pages" Environment to make sure the deployment succeeds |
| 262 | +* [ ] Watch for the "github pages" Environment to make sure the deployment succeeds |
257 | 263 |
|
258 | 264 | The User Guide website should update itself via the deploy GitHub Action. Should |
259 | 265 | this fail the server must be updated manually. See repo and hosting details in |
|
0 commit comments