Skip to content

docs: fix how to update next minor upgrade branch #6154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kenjis merged 2 commits into from
Jun 23, 2022
Merged

docs: fix how to update next minor upgrade branch #6154

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42013c8
docs: fix how to update next minor upgrade branch
kenjis Jun 18, 2022
72cdccd
docs: fix commands
kenjis Jun 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions admin/RELEASE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ Copy the resulting content into **CHANGELOG.md** and adjust the format to match

* 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
```console
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*)

## CodeIgniter4
Expand All @@ -49,10 +53,11 @@ Copy the resulting content into **CHANGELOG.md** and adjust the format to match
* Merge the PR then fast-forward `develop` to catch the merge commit
* Update the next minor upgrade branch `4.x`
```console
git fetch upstream
git fetch origin
git checkout 4.x
git merge upstream/develop
git push upstream HEAD
git merge origin/4.x
git merge origin/develop
git push origin HEAD
```
* Create a new Release:
* Version: "v4.x.x"
Expand Down