It's true that kind of merge sometimes become a pain. :) It looks like we have ANT build all blue, there is only Maven left. Not sure whether I find cycles tomorrow to look into that, so anyone is welcome to help.
Thanks, Piotr 2017-10-18 21:35 GMT+02:00 Harbs <[email protected]>: > Yeah. Sorry about that. I was out all day. > > Merging code committed to old removed files is tricky. I think I got it > this time... > > Harbs > > > On Oct 18, 2017, at 3:41 PM, Piotr Zarzycki <[email protected]> > wrote: > > > > Harbs, > > > > Maybe something wasn't merge properly. It look like reason is in that > file > > [1]. > > > > [1] > > https://github.com/apache/royale-compiler/blob/develop/ > compiler-jx/src/main/java/org/apache/flex/compiler/internal/ > codegen/js/JSWriter.java > > > > Piotr > > > > On Wed, Oct 18, 2017, 14:03 Harbs <[email protected]> wrote: > > > >> For some reason it’s looking for org.apache.flex.compiler.codegen > instead > >> of org.apache.royale.compiler.codegen > >> > >>> On Oct 18, 2017, at 2:52 PM, Piotr Zarzycki <[email protected] > > > >> wrote: > >>> > >>> Again a bit farther - Now it's pointing to some problems in code [1]. > >>> > >>> [1] http://apacheflexbuild.cloudapp.net:8080/job/royale-compiler/30/ > >>> > >>> Piotr > >>> > >>> On Wed, Oct 18, 2017, 13:18 Piotr Zarzycki <[email protected]> > >>> wrote: > >>> > >>>> I remember that there is some work to do on Tests, they were temporary > >>>> disabled. I'm doing it also on develop for ANT build. Removing > >>>> royale.dependent.tests. > >>>> > >>>> Piotr > >>>> > >>>> On Wed, Oct 18, 2017, 12:57 Harbs <[email protected]> wrote: > >>>> > >>>>> Good luck. Let me know if you need my help working on this. > >>>>> > >>>>>> On Oct 18, 2017, at 1:11 PM, Piotr Zarzycki < > >> [email protected]> > >>>>> wrote: > >>>>>> > >>>>>> Maven failed again, but I have found reason of failing in case of > ANT > >>>>>> build. Let's see whether it will work. > >>>>>> > >>>>>> Piotr > >>>>>> > >>>>>> On Wed, Oct 18, 2017, 11:49 Piotr Zarzycki < > [email protected] > >>> > >>>>>> wrote: > >>>>>> > >>>>>>> Harbs, > >>>>>>> > >>>>>>> I think I got it. I have switched to other windows machine. Let's > see > >>>>> what > >>>>>>> happens. > >>>>>>> > >>>>>>> Piotr > >>>>>>> > >>>>>>> 2017-10-18 11:46 GMT+02:00 Piotr Zarzycki < > [email protected] > >>> : > >>>>>>> > >>>>>>>> I know what happens. In case of Maven first need to be build > >> projects: > >>>>>>>> compiler-jburg-types and compiler-build-tools and than the rest > one. > >>>>> Not > >>>>>>>> sure yet how to trigger that. Maybe we need to change "Jenkins" > >> file. > >>>>>>>> > >>>>>>>> Piotr > >>>>>>>> > >>>>>>>> 2017-10-18 11:42 GMT+02:00 Harbs <[email protected]>: > >>>>>>>> > >>>>>>>>> Nope. Failed. > >>>>>>>>> > >>>>>>>>> It looks like it can’t find some dependencies. Not sure what that > >>>>> means… > >>>>>>>>> > >>>>>>>>>> On Oct 18, 2017, at 11:49 AM, Piotr Zarzycki < > >>>>>>>>> [email protected]> wrote: > >>>>>>>>>> > >>>>>>>>>> Harbs, > >>>>>>>>>> > >>>>>>>>>> Will be great! :) Thanks for doing that! I hope you didn't have > >> any > >>>>>>>>> ugly > >>>>>>>>>> conflicts. :) > >>>>>>>>>> > >>>>>>>>>> Piotre > >>>>>>>>>> > >>>>>>>>>> > >>>>>>>>>> 2017-10-18 10:41 GMT+02:00 Harbs <[email protected]>: > >>>>>>>>>> > >>>>>>>>>>> Fingers crossed… ;-) > >>>>>>>>>>> > >>>>>>>>>>>> On Oct 18, 2017, at 11:39 AM, Piotr Zarzycki < > >>>>>>>>> [email protected]> > >>>>>>>>>>> wrote: > >>>>>>>>>>>> > >>>>>>>>>>>> Justin, > >>>>>>>>>>>> > >>>>>>>>>>>> I saw that Harbs just pushed merge to develop, so I run > >>>>>>>>> Royale-compiler > >>>>>>>>>>> for > >>>>>>>>>>>> Maven [1] - let's see what happens. > >>>>>>>>>>>> > >>>>>>>>>>>> [1] https://builds.apache.org/job/Royale-compiler/ > >>>>>>>>>>>> > >>>>>>>>>>>> Piotr > >>>>>>>>>>>> > >>>>>>>>>>>> 2017-10-18 10:36 GMT+02:00 Justin Mclean < > >>>>> [email protected]>: > >>>>>>>>>>>> > >>>>>>>>>>>>> Hi, > >>>>>>>>>>>>> > >>>>>>>>>>>>> BTW Jenkins is also reporting failures to compile the develop > >>>>>>>>> branch of > >>>>>>>>>>>>> royale-asjs [1] for the last two builds. That’s since the > >> rename > >>>>>>>>> branch > >>>>>>>>>>> has > >>>>>>>>>>>>> been merged. > >>>>>>>>>>>>> > >>>>>>>>>>>>> Thanks, > >>>>>>>>>>>>> Justin > >>>>>>>>>>>>> > >>>>>>>>>>>>> 1. https://builds.apache.org/job/Royale-asjs/ > >>>>>>>>>>>> > >>>>>>>>>>>> > >>>>>>>>>>>> > >>>>>>>>>>>> > >>>>>>>>>>>> -- > >>>>>>>>>>>> > >>>>>>>>>>>> Piotr Zarzycki > >>>>>>>>>>>> > >>>>>>>>>>>> mobile: +48 880 859 557 > >>>>>>>>>>>> skype: zarzycki10 > >>>>>>>>>>>> > >>>>>>>>>>>> LinkedIn: http://www.linkedin.com/piotrzarzycki > >>>>>>>>>>>> <https://pl.linkedin.com/in/piotr-zarzycki-92a53552> > >>>>>>>>>>>> > >>>>>>>>>>>> GitHub: https://github.com/piotrzarzycki21 > >>>>>>>>>>> > >>>>>>>>>>> > >>>>>>>>>> > >>>>>>>>>> > >>>>>>>>>> -- > >>>>>>>>>> > >>>>>>>>>> Piotr Zarzycki > >>>>>>>>>> > >>>>>>>>>> mobile: +48 880 859 557 > >>>>>>>>>> skype: zarzycki10 > >>>>>>>>>> > >>>>>>>>>> LinkedIn: http://www.linkedin.com/piotrzarzycki > >>>>>>>>>> <https://pl.linkedin.com/in/piotr-zarzycki-92a53552> > >>>>>>>>>> > >>>>>>>>>> GitHub: https://github.com/piotrzarzycki21 > >>>>>>>>> > >>>>>>>>> > >>>>>>>> > >>>>>>>> > >>>>>>>> -- > >>>>>>>> > >>>>>>>> Piotr Zarzycki > >>>>>>>> > >>>>>>>> mobile: +48 880 859 557 <+48%20880%20859%20557> > >>>>>>>> skype: zarzycki10 > >>>>>>>> > >>>>>>>> LinkedIn: http://www.linkedin.com/piotrzarzycki > >>>>>>>> <https://pl.linkedin.com/in/piotr-zarzycki-92a53552> > >>>>>>>> > >>>>>>>> GitHub: https://github.com/piotrzarzycki21 > >>>>>>>> > >>>>>>> > >>>>>>> > >>>>>>> > >>>>>>> -- > >>>>>>> > >>>>>>> Piotr Zarzycki > >>>>>>> > >>>>>>> mobile: +48 880 859 557 > >>>>>>> skype: zarzycki10 > >>>>>>> > >>>>>>> LinkedIn: http://www.linkedin.com/piotrzarzycki > >>>>>>> <https://pl.linkedin.com/in/piotr-zarzycki-92a53552> > >>>>>>> > >>>>>>> GitHub: https://github.com/piotrzarzycki21 > >>>>>>> > >>>>> > >>>>> > >> > >> > > -- Piotr Zarzycki mobile: +48 880 859 557 skype: zarzycki10 LinkedIn: http://www.linkedin.com/piotrzarzycki <https://pl.linkedin.com/in/piotr-zarzycki-92a53552> GitHub: https://github.com/piotrzarzycki21
