[Development] When is Qt 4.8 in Gerrit? (Was: Qt Commercial 4.8.0 release delta to LGPL version)
On 20.12.2011 14.25, "marius.storm-ol...@nokia.com" wrote: >On 12/20/2011 06:10 AM, ext Sergio Ahumada wrote: >>> Unfortunately moving it into gerrit is not as easy as one might think >>>as >>> the testing infrastructure is somewhat different between Qt 4.x and Qt >>>5. >>> We could move Qt 4.x into gerrit very fast, but would loose the CI on >>>it. >>> If we want to keep CI, there's some work that needs to happen first. >>> Sergio and Rohan know the details here. >>> >>> Cheers, >>> Lars >> >> Basically we need to integrate (or something like it): >> >> http://codereview.qt-project.org/9872 >> http://codereview.qt-project.org/11460 >> http://codereview.qt-project.org/11462 >> >> and we need to make the tests to pass or mark them as insignificant (I >> already have a patch for this). >> >> We have some other options (to start with, improving over time): >> >> - No CI et al, direct submit [1] => now >> >> - CI with some platforms (linux, windows, mac) enforcing compilation >> only => a week ? >> >> - CI with some platforms (linux, windows, mac) enforcing compilation and >> autotests = couple of weeks ? >> >> - CI with the current platforms in enforcing mode (macosx 10.6, macosx >> 10.7, winxp msvc2008, win7 msvc2008, win7 msvc2010, linux g++, linux >> icc) => months ? > > >I really don't want 4.x out there without *anything*, so lets skip the >step with direct submits. We don't do it for Qt 5, so we definitely >shouldn't do it for Qt 4. > >I think we could go ahead with a multi-phase process though. > >So, we'd start with enforcing compilation on the desktop platforms, >which means ~1 weeks worth of work to get it migrated and up and running >with CC (Continuous Compilation ;) > >Then 1 week later we can add the autotests too, so we get CI. > >Then, as we are able to adapt the other platforms, we add them when they >are available until we cover all the platforms we have currently for Qt 4. > >-- >.marius I hope you have been able to progress with the task of getting Qt 4.8 into Gerrit. Looking into https://bugreports.qt.nokia.com/browse/QTQAINFRA-393 it seems that there is still quite much to do. What is the current estimate when we have 4.8 in Gerrit? For us it is important to know when we can re-submit our existing 4.8 merge requests through it. In the case it takes many weeks still, maybe it is possible to handle the pending merge requests with the old system? Yours, -- Tuukka Turunen Director, Qt Commercial R&D Digia Plc Piippukatu 11, 40100 Jyväskylä, Finland Visit us at: www.digia.com qt.digia.com ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
Re: [Development] When is Qt 4.8 in Gerrit? (Was: Qt Commercial 4.8.0 release delta to LGPL version)
Hi, On 01/09/2012 12:00 PM, ext Turunen Tuukka wrote: > > I hope you have been able to progress with the task of getting Qt 4.8 into > Gerrit. > > Looking into https://bugreports.qt.nokia.com/browse/QTQAINFRA-393 it seems > that there is still quite much to do. > > What is the current estimate when we have 4.8 in Gerrit? Qt 4.x has been in Gerrit since 03/01/2012 https://bugreports.qt.nokia.com/browse/QTQAINFRA-432 > For us it is important to know when we can re-submit our existing 4.8 > merge requests through it. > > In the case it takes many weeks still, maybe it is possible to handle the > pending merge requests with the old system? > > Yours, > > -- > Tuukka Turunen > Director, Qt Commercial R&D > Digia Plc > Piippukatu 11, 40100 Jyväskylä, Finland Cheers, -- Sergio Ahumada Mobile Phones Middleware - Quality Engineering http://wikis.in.nokia.com/QtQualityEngineering ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
Re: [Development] When is Qt 4.8 in Gerrit? (Was: Qt Commercial 4.8.0 release delta to LGPL version)
Thanks! And also the 393 task seems to be updated today to reflect this. Yours, -- Tuukka Turunen Director, Qt Commercial R&D Digia Plc Piippukatu 11, 40100 Jyväskylä, Finland Visit us at: www.digia.com or qt.digia.com On 9.1.2012 16.12, "Sergio Ahumada" wrote: >Hi, > >On 01/09/2012 12:00 PM, ext Turunen Tuukka wrote: >> >> I hope you have been able to progress with the task of getting Qt 4.8 >>into >> Gerrit. >> >> Looking into https://bugreports.qt.nokia.com/browse/QTQAINFRA-393 it >>seems >> that there is still quite much to do. >> >> What is the current estimate when we have 4.8 in Gerrit? > >Qt 4.x has been in Gerrit since 03/01/2012 > >https://bugreports.qt.nokia.com/browse/QTQAINFRA-432 > >> For us it is important to know when we can re-submit our existing 4.8 >> merge requests through it. >> >> In the case it takes many weeks still, maybe it is possible to handle >>the >> pending merge requests with the old system? >> >> Yours, >> >> -- >> Tuukka Turunen >> Director, Qt Commercial R&D >> Digia Plc >> Piippukatu 11, 40100 Jyväskylä, Finland > >Cheers, >-- >Sergio Ahumada >Mobile Phones Middleware - Quality Engineering >http://wikis.in.nokia.com/QtQualityEngineering >___ >Development mailing list >Development@qt-project.org >http://lists.qt-project.org/mailman/listinfo/development ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
Re: [Development] When is Qt 4.8 in Gerrit? (Was: Qt Commercial 4.8.0 release delta to LGPL version)
On Monday, 9 de January de 2012 15.12.32, Sergio Ahumada wrote: > Hi, > > On 01/09/2012 12:00 PM, ext Turunen Tuukka wrote: > > I hope you have been able to progress with the task of getting Qt 4.8 into > > Gerrit. > > > > Looking into https://bugreports.qt.nokia.com/browse/QTQAINFRA-393 it seems > > that there is still quite much to do. > > > > What is the current estimate when we have 4.8 in Gerrit? > > Qt 4.x has been in Gerrit since 03/01/2012 > > https://bugreports.qt.nokia.com/browse/QTQAINFRA-432 I'd have named the repository "qt4". If it's not too late and it doesn't break everything... -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center Intel Sweden AB - Registration Number: 556189-6027 Knarrarnäsgatan 15, 164 40 Kista, Stockholm, Sweden signature.asc Description: This is a digitally signed message part. ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
Re: [Development] When is Qt 4.8 in Gerrit? (Was: Qt Commercial 4.8.0 release delta to LGPL version)
Hi Sergio, On 01/09/2012 06:12 AM, ext Sergio Ahumada wrote: > Qt 4.x has been in Gerrit since 03/01/2012 > > https://bugreports.qt.nokia.com/browse/QTQAINFRA-432 Wow, such an awaited event went so unnoticed. The bug report is not that verbose either. Can you or someone write a blog post that we can link to in order to let the world know? It would be really appreciated. Also, is there a Qt Project maintainer for Qt 4 or how does it work? Who are the contacts? Please fill the appropriate information at http://wiki.qt-project.org/Maintainers and/or http://wiki.qt-project.org/Who_does_what . Even a Qt 4.8 wiki page would be useful. Hopefully these steps will contribute to have a better sync between Qt 4.8.1 and Qt Commercial 4.8.1 Thank you for the steps out! -- Quim ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
Re: [Development] When is Qt 4.8 in Gerrit? (Was: Qt Commercial 4.8.0 release delta to LGPL version)
On 1/9/12 6:09 PM, "ext Quim Gil" wrote: >Hi Sergio, > >On 01/09/2012 06:12 AM, ext Sergio Ahumada wrote: >> Qt 4.x has been in Gerrit since 03/01/2012 >> >> https://bugreports.qt.nokia.com/browse/QTQAINFRA-432 > >Wow, such an awaited event went so unnoticed. The bug report is not that >verbose either. It isn't supposed to, don't worry. > >Can you or someone write a blog post that we can link to in order to let >the world know? It would be really appreciated. Blog post will come tomorrow. Cheers, Lars > >Also, is there a Qt Project maintainer for Qt 4 or how does it work? Who >are the contacts? Please fill the appropriate information at >http://wiki.qt-project.org/Maintainers and/or >http://wiki.qt-project.org/Who_does_what . Even a Qt 4.8 wiki page would >be useful. > >Hopefully these steps will contribute to have a better sync between Qt >4.8.1 and Qt Commercial 4.8.1 > >Thank you for the steps out! > >-- >Quim > > >___ >Development mailing list >Development@qt-project.org >http://lists.qt-project.org/mailman/listinfo/development ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
Re: [Development] When is Qt 4.8 in Gerrit? (Was: Qt Commercial 4.8.0 release delta to LGPL version)
With both 4.8 and 5.0 in gerrit, how should we do back/forward porting of bug fixes between repositories? Should the change author cherry-pick, resolve conflicts, and submit a change to the other repository? Or will a fix accepted to 4.8 be applied to 5.x without usually needing further involvement of the author? (like the 4.7->4.8 merges, although it probably can't be done with a git merge) I'd assume the author knows best how to resolve conflicts, but it raises the bar for entry. My view is the workflow should look like this: 1. author submits change to the version they normally work on (4.8 or 5.0) 2. code review happens, change accepted 3. CI happens, change integrated 4. author cherry-picks to the other repository, resolving any conflicts & test on their preferred platform 5. code review - if there weren't conflicts then this should often be a formality by the previous approvers 6. CI happens - this will pick up if the change isn't compatible with the new/old architecture. (if the reviewers missed it) My experience is that cherry-picking QtCore and QtNetwork changes is usually OK, except for autotests which conflict due to path changes Subject to local law, communications with Accenture and its affiliates including telephone calls and emails (including content), may be monitored by our systems for the purposes of security and the assessment of internal compliance with Accenture policy. __ www.accenture.com ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
Re: [Development] When is Qt 4.8 in Gerrit? (Was: Qt Commercial 4.8.0 release delta to LGPL version)
On Tuesday, 10 de January de 2012 11.57.35, shane.kea...@accenture.com wrote: > 1. author submits change to the version they normally work on (4.8 or 5.0) > 2. code review happens, change accepted > 3. CI happens, change integrated > 4. author cherry-picks to the other repository, resolving any conflicts & > test on their preferred platform 5. code review - if there weren't > conflicts then this should often be a formality by the previous approvers > 6. CI happens - this will pick up if the change isn't compatible with the > new/old architecture. (if the reviewers missed it) > > My experience is that cherry-picking QtCore and QtNetwork changes is usually > OK, except for autotests which conflict due to path changes I agree, Shane. Starting from either repository is fine. What's important is that all bugfixes that go into 4.8 also go into 5.0, if they are relevant. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center Intel Sweden AB - Registration Number: 556189-6027 Knarrarnäsgatan 15, 164 40 Kista, Stockholm, Sweden signature.asc Description: This is a digitally signed message part. ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
Re: [Development] When is Qt 4.8 in Gerrit? (Was: Qt Commercial 4.8.0 release delta to LGPL version)
On 1/9/12 8:50 PM, "ext lars.kn...@nokia.com" wrote: >On 1/9/12 6:09 PM, "ext Quim Gil" wrote: > >>Hi Sergio, >> >>On 01/09/2012 06:12 AM, ext Sergio Ahumada wrote: >>> Qt 4.x has been in Gerrit since 03/01/2012 >>> >>> https://bugreports.qt.nokia.com/browse/QTQAINFRA-432 >> >>Wow, such an awaited event went so unnoticed. The bug report is not that >>verbose either. > >It isn't supposed to, don't worry. >> >>Can you or someone write a blog post that we can link to in order to let >>the world know? It would be really appreciated. > >Blog post will come tomorrow. Here we go: http://labs.qt.nokia.com/2012/01/10/qt-4-moved-to-open-governance/ Cheers, Lars > >Cheers, >Lars > >> >>Also, is there a Qt Project maintainer for Qt 4 or how does it work? Who >>are the contacts? Please fill the appropriate information at >>http://wiki.qt-project.org/Maintainers and/or >>http://wiki.qt-project.org/Who_does_what . Even a Qt 4.8 wiki page would >>be useful. >> >>Hopefully these steps will contribute to have a better sync between Qt >>4.8.1 and Qt Commercial 4.8.1 >> >>Thank you for the steps out! >> >>-- >>Quim >> >> >>___ >>Development mailing list >>Development@qt-project.org >>http://lists.qt-project.org/mailman/listinfo/development > >___ >Development mailing list >Development@qt-project.org >http://lists.qt-project.org/mailman/listinfo/development ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
Re: [Development] When is Qt 4.8 in Gerrit? (Was: Qt Commercial 4.8.0 release delta to LGPL version)
On 10.1.2012 14.58, "lars.kn...@nokia.com" wrote: >On 1/9/12 8:50 PM, "ext lars.kn...@nokia.com" >wrote: > >>On 1/9/12 6:09 PM, "ext Quim Gil" wrote: >> >>>Hi Sergio, >>> >>>On 01/09/2012 06:12 AM, ext Sergio Ahumada wrote: Qt 4.x has been in Gerrit since 03/01/2012 https://bugreports.qt.nokia.com/browse/QTQAINFRA-432 >>> >>>Wow, such an awaited event went so unnoticed. The bug report is not that >>>verbose either. >> >>It isn't supposed to, don't worry. >>> >>>Can you or someone write a blog post that we can link to in order to let >>>the world know? It would be really appreciated. >> >>Blog post will come tomorrow. > >Here we go: > >http://labs.qt.nokia.com/2012/01/10/qt-4-moved-to-open-governance/ > >Cheers, >Lars Great! We will start pushing our pending 4.8 merge requests trough Gerrit. We will first push them to 4.8, but many will be applicable to 5 as well. We would like to proceed in such way that the review is done for 4.8, and after accepted we push applicable commits to Qt 5. At some point, maybe to some extent already for 4.8.1, we need to agree how we can best backport fixes for errors in 4.8 that are already fixed in Qt 5. Yours, Tuukka > >> >>Cheers, >>Lars >> >>> >>>Also, is there a Qt Project maintainer for Qt 4 or how does it work? Who >>>are the contacts? Please fill the appropriate information at >>>http://wiki.qt-project.org/Maintainers and/or >>>http://wiki.qt-project.org/Who_does_what . Even a Qt 4.8 wiki page would >>>be useful. >>> >>>Hopefully these steps will contribute to have a better sync between Qt >>>4.8.1 and Qt Commercial 4.8.1 >>> >>>Thank you for the steps out! >>> >>>-- >>>Quim >>> >>> >>>___ >>>Development mailing list >>>Development@qt-project.org >>>http://lists.qt-project.org/mailman/listinfo/development >> >>___ >>Development mailing list >>Development@qt-project.org >>http://lists.qt-project.org/mailman/listinfo/development > >___ >Development mailing list >Development@qt-project.org >http://lists.qt-project.org/mailman/listinfo/development ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
Re: [Development] When is Qt 4.8 in Gerrit? (Was: Qt Commercial 4.8.0 release delta to LGPL version)
On Tue, Jan 10, 2012 at 11:57:35AM +, ext shane.kea...@accenture.com wrote: > My view is the workflow should look like this: > i agree, except with the first point: > 1. author submits change to the version they normally work on (4.8 or 5.0) > no, the author starts his submission against qt5 (irrespective what he actually started with). we do not want to get (even further) into the situation where commits are missing from qt5, so a clear "qt5 first" policy is needed. only exception are changes which are clearly not applicable to qt5 (primarily because a platform was dropped). > My experience is that cherry-picking QtCore and QtNetwork changes is > usually OK, except for autotests which conflict due to path changes > as i announced before, there is the git-qt-cherry-pick script in the qtrepotools repository to assist with that. it's not much, but it helps. if it doesn't rewrite some paths you want rewritten, fix it. ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
Re: [Development] When is Qt 4.8 in Gerrit? (Was: Qt Commercial 4.8.0 release delta to LGPL version)
On 10.1.2012 19.04, "Oswald Buddenhagen" wrote: >On Tue, Jan 10, 2012 at 11:57:35AM +, ext shane.kea...@accenture.com >wrote: >> My view is the workflow should look like this: >> >i agree, except with the first point: > >> 1. author submits change to the version they normally work on (4.8 or >>5.0) >> >no, the author starts his submission against qt5 (irrespective what he >actually started with). we do not want to get (even further) into the >situation where commits are missing from qt5, so a clear "qt5 first" >policy is needed. only exception are changes which are clearly not >applicable to qt5 (primarily because a platform was dropped). At least for the pending 4.8 merge requests we definetely want to first push them to 4.8 in gerrit. But we will push these also to Qt 5, of course we want it to contain these fixes as well. We plan to do this after the review is done and we know if the fix is accepted. Later on we can of course push to Qt 5 first, if the fix is relevant for Qt 5. Yours, Tuukka ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
Re: [Development] When is Qt 4.8 in Gerrit? (Was: Qt Commercial 4.8.0 release delta to LGPL version)
On Wed, Jan 11, 2012 at 06:59:34AM +, ext Turunen Tuukka wrote: > But we will push these also to Qt 5, of course we want it to contain these > fixes as well. We plan to do this after the review is done and we know if > the fix is accepted. > and how exactly do you plan to ensure that nothing falls through the cracks? and that it is forward-ported *soon*? going for a jira excess, with a subtask for each qt5 forwardport? i'll endorse an exception if you present a credible process. have fun ... ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
Re: [Development] When is Qt 4.8 in Gerrit? (Was: Qt Commercial 4.8.0 release delta to LGPL version)
On 11.1.2012 13.00, "Oswald Buddenhagen" wrote: >On Wed, Jan 11, 2012 at 06:59:34AM +, ext Turunen Tuukka wrote: >> But we will push these also to Qt 5, of course we want it to contain >>these >> fixes as well. We plan to do this after the review is done and we know >>if >> the fix is accepted. >> >and how exactly do you plan to ensure that nothing falls through the >cracks? and that it is forward-ported *soon*? going for a jira excess, >with a subtask for each qt5 forwardport? i'll endorse an exception if >you present a credible process. have fun ... We have all those pending merge requests available as patches in our internal git, so it is easy to see that all do get to both 4.8 and 5. Process we propose is the following: 1. Each person from Digia who have pending merge requests in the old system pushes them to 4.8 with new system. 2. The contributions are reviewed and hopefully most are accepted to 4.8 3. We push all the applicable contributions to Qt 5, which should be very easy after they are reviewed for 4.8 As said this is the process for the pending 4.8 contributions. We prefer this in order to have the delta between 4.8.1 LGPL and Commercial smaller than it was in 4.8.0. If there are others than Digia with pending contributions to 4.8, I think the same approach would be good to use, as this way their fixes get to the users faster (as 4.8.1 will be out sooner than 5.0.0). For future fixes we can take the approach of doing them to Qt 5 first, with exception of such fixes that we need for 4.8 but are not relevant for 5. Yours, -- Tuukka Turunen Director, Qt Commercial R&D Digia Plc Piippukatu 11, 40100 Jyväskylä, Finland Visit us at: www.digia.com or qt.digia.com ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
Re: [Development] When is Qt 4.8 in Gerrit? (Was: Qt Commercial 4.8.0 release delta to LGPL version)
In this particular case most of the contributions coming from Digia are contribs which were in Gitorious before, and them not being accepted put at least handled is our fault. I think for those its only fair that those are handled against 4.8, and then forward ported to 5.0. Once those original patches are handled, I assume Digia will follow the normal workflow by originating the patches in 5.0, and backporting them to 4.7/4.8. -- Sent from my Nokia N9 On 1/11/12 6:03 ext Oswald Buddenhagen wrote: On Wed, Jan 11, 2012 at 06:59:34AM +, ext Turunen Tuukka wrote: > But we will push these also to Qt 5, of course we want it to contain these > fixes as well. We plan to do this after the review is done and we know if > the fix is accepted. > and how exactly do you plan to ensure that nothing falls through the cracks? and that it is forward-ported *soon*? going for a jira excess, with a subtask for each qt5 forwardport? i'll endorse an exception if you present a credible process. have fun ... ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
Re: [Development] When is Qt 4.8 in Gerrit? (Was: Qt Commercial 4.8.0 release delta to LGPL version)
On Wednesday 11 January 2012 14:13:45 ext marius.storm-ol...@nokia.com wrote: > In this particular case most of the contributions coming from Digia are > contribs which were in Gitorious before, and them not being accepted put at > least handled is our fault. > > I think for those its only fair that those are handled against 4.8, and then > forward ported to 5.0. > > Once those original patches are handled, I assume Digia will follow the > normal workflow by originating the patches in 5.0, and backporting them to > 4.7/4.8. I think so, too. Andre' ___ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development
