Welcome Guest, Not a member yet? Register   Sign In
CodeIgniter Forums CodeIgniter 4 CodeIgniter 4 Discussion Hotfix branch
Hotfix branch
  • Offline iRedds
    Senior Member
  • ****
  • Posts: 662
    Threads: 36
    Joined: Apr 2019
    Reputation: 45
#1
01-03-2022, 11:46 PM

CI follows git-flow, but does not use the hotfix branch for critical fixes.
For example this PR https://github.com/codeigniter4/CodeIgniter4/pull/5536 
It fixes a bug directly affecting the work. But the fix will be added only in the next release.
I believe that such PRs should get into the main branch as quickly as possible, ignoring the release cycle.
Reply
  • Offline kenjis
    Administrator
  • *******
  • Posts: 3,250
    Threads: 90
    Joined: Oct 2014
    Reputation: 205
#2
01-04-2022, 12:53 AM

I don't know if CI should follow git-flow, but I am also in favor of more frequent bug-fix-only releases.
And to do so, it seems we need to change branching a bit.
ci-phpunit-test | CodeIgniter Testing Guide | CodeIgniter 3 to 4 Upgrade Helper
Reply




Theme © iAndrew 2016 - Forum software by © MyBB