51
51
* Create a new PR from ` develop ` to ` master ` :
52
52
* Title: "4.x.x Ready code"
53
53
* Description: blank
54
- * Merge the PR then fast-forward ` develop ` to catch the merge commit
55
- * Update the next minor upgrade branch ` 4.x `
56
- ``` console
57
- git fetch origin
58
- git checkout 4.x
59
- git merge origin/4.x
60
- git merge origin/develop
61
- git push origin HEAD
62
- ```
63
- * Create a new Release:
54
+ * Merge the PR then create a new Release:
64
55
* Version: "v4.x.x"
65
56
* Title: "CodeIgniter 4.x.x"
66
57
* Description:
@@ -76,25 +67,23 @@ composer create-project codeigniter4/appstarter release-test
76
67
cd release-test
77
68
composer test && composer info codeigniter4/framework
78
69
```
79
- * publish any Security Advisories that were resolved from private forks
80
-
81
- ## User Guide
82
-
83
- ** This is now handled by GitHub Actions!**
84
-
85
- Verify that the Actions succeeded:
86
- * "Deploy User Guide", this repo
87
- * "Deploy Production", UG repo
88
- * "pages-build-deployment", both repos
89
-
90
- See the legacy notes in Appendix for reference or to help manually recover from workflow failures.
91
-
92
- ## Announcement
93
-
94
- > Note: This forum is restricted to administrators.
95
-
96
- * Make a new topic in the "News & Discussion" forums: https://forum.codeigniter.com/forum-2.html
97
- * The content is somewhat organic, but should include any major features and changes as well as a link to the User Guide's changelog
70
+ * Verify that the User Guide Actions succeeded:
71
+ * "Deploy User Guide", framework repo
72
+ * "Deploy Production", UG repo
73
+ * "pages-build-deployment", both repos
74
+ * Fast-forward ` develop ` branch to catch the merge commit from ` master `
75
+ * Update the next minor upgrade branch ` 4.x ` :
76
+ ``` console
77
+ git fetch origin
78
+ git checkout 4.x
79
+ git merge origin/4.x
80
+ git merge origin/develop
81
+ git push origin HEAD
82
+ ```
83
+ * Publish any Security Advisories that were resolved from private forks
84
+ * Announce the release on the forums and Slack channel (note: this forum is restricted to administrators):
85
+ * Make a new topic in the "News & Discussion" forums: https://forum.codeigniter.com/forum-2.html
86
+ * The content is somewhat organic, but should include any major features and changes as well as a link to the User Guide's changelog
98
87
99
88
## After Publishing Security Advisory
100
89
0 commit comments