[Development] Focusing bug fixes to 5.9 branch and patch releases during H1/17

[Simon Hausmann]

Hi,


"In January, TQC promised to increase the CI capacity. It's now three months later

and you still use the same argument? "

Let's be very clear: The promise for increased capacity was for H1.

http://lists.qt-project.org/pipermail/development/2017-February/028757.html

We are working on moving to a new data center and purchasing new hardware. The project is scheduled for
completion by the end of the first half of the year. It is more or less a binary switch from the Qt perspective,
as the current architecture does not really allow us to incrementally grow the running system. Replacing the
system is also taking man power.

So the argument is valid and we are working on increasing the capacity.

Simon

________________________________
From: Development <development-bounces+simon.hausmann=qt.io at qt-project.org> on behalf of Marc Mutz <marc.mutz at kdab.com>
Sent: Tuesday, April 11, 2017 11:14:59 AM
To: Qt development mailing list
Subject: Re: [Development] Focusing bug fixes to 5.9 branch and patch releases during H1/17

On Tuesday 11 April 2017 10:34:20 Ville Voutilainen wrote:
> To elaborate: I run a bleeding-edge compiler. It feels odd to me that
> the best branch to run it on
> is a non-bleeding-edge branch, it's quite the opposite.

I know GCC works differently, probably because you use a RCS that sucks at
merging, but the Qt way was, and continues to be, to put (important) bug-fixes
(incl. compile-fixes) into the stable branch, and merge them up. This is how
Git works best, and apart from LTS, we strongly discourage cherry-picking. The
problem at hand is now whether 5.8 continues to be the stable branch, even
though no release is planned from it.

I say yes, and Tuuka says no.

As a compromise, I suggested to keep qtbase's 5.8 open, and close the other
module's 5.8 branches.

Repeating Thiago's stats from Mar 14th:

$ git rev-list --no-merges --since=2.months.ago v5.8.0..origin/5.8 | wc -l
228
$ git rev-list --no-merges --since=2.months.ago origin/5.8..origin/5.9 | wc -l
346
$ git rev-list --no-merges --since=2.months.ago origin/5.9..origin/dev | wc -l
202

So, at this point, 5.9 receives more commits, but 5.8 is far from starved. It
receives roughly half the commits 5.9 receives, also at shorter scales:

$ git rev-list --no-merges --since=March.14th v5.8.0..origin/5.8 | wc -l
71
$ git rev-list --no-merges --since=March.14th origin/5.8..origin/5.9 | wc -l
156
$ git rev-list --no-merges --since=March.14th origin/5.9..origin/dev | wc -l
131

I see lots of advantages to keeping 5.8 open, but as usual, you will counter
them with "CI is overloaded" and that'll be the end of the discussion. In
January, TQC promised to increase the CI capacity. It's now three months later
and you still use the same argument? This re-inforces the fear that we'll also
not have a 5.9.1.

Thanks,
Marc

--
Marc Mutz <marc.mutz at kdab.com> | Senior Software Engineer
KDAB (Deutschland) GmbH & Co.KG, a KDAB Group Company
Tel: +49-30-521325470
KDAB - The Qt, C++ and OpenGL Experts
_______________________________________________
Development mailing list
Development at qt-project.org
http://lists.qt-project.org/mailman/listinfo/development
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.qt-project.org/pipermail/development/attachments/20170411/d0a9112f/attachment.html>