On Tue, 4 Aug 2020 at 19:40, Nikita Popov <nikita....@gmail.com> wrote:
> On Tue, Aug 4, 2020 at 7:01 PM Nikita Popov <nikita....@gmail.com> wrote: > >> On Tue, Aug 4, 2020 at 9:39 AM Gabriel Caruso <carusogabr...@php.net> >> wrote: >> >>> Good morning Internals! >>> >>> This is a reminder that *today* we are Feature Freezing and branching >>> `PHP-8.0`, following the PHP 8.0 schedule ( >>> https://wiki.php.net/todo/php80#timetable). >>> >>> The branch will happen around >>> >>> - 1 am (+1 day) UTC+8 (SGT) >>> - 7 pm UTC+2 (CEST, my timezone) >>> - 6 pm UTC+1 (BST) >>> - 1 pm UTC-4 (EDT) >>> >>> Let us know if you have any questions! >>> >>> -- Gabriel Caruso >>> >> >> Sorry, I didn't catch that this message said feature freeze *and branch*. >> >> Please do not create a separate PHP-8.0 branch yet. A separate branch is >> only needed if anyone wants to start landing changes targeting PHP 8.1 >> already -- as far as I'm aware, nobody is actively working on PHP 8.1 yet. >> >> Due to our git workflow, creating a branch now means that every single >> commit to PHP 8.0 will also require a merge into master. This is a rather >> big waste of time and CI resources if we expect PHP-8.0 and master to be >> identical in the near future. >> >> Thanks, >> Nikita >> > > Preferably the branch would coincide with the ABI freeze, which I presume > would be RC1. > > Nikita > Hello, I created the branch based on https://github.com/php/php-src/blob/master/docs/release-process.md#re-releasing-the-same-version-or--pl. Sorry for it in advance. I understand Nikita's concerns and giving that now we have (in a security fix, for example) the gitflow is `PHP-7.2` ~> `PHP-7.3` ~> `PHP-7.4` ~> `PHP-8.0` ~> `master`. I wouldn't mind branching it another day, we just need to document if for future reasons.
