7.1.0 Release and students branches merge...

[Gilles Caulier]

I just merged too the Nghia development branch to master

Both development student branches are now merged back without conflict...

All is now ready to continue the story in master with next 7.2.0.

Best

Gilles


Le jeu. 3 sept. 2020 à 07:10, Gilles Caulier
<caulier.gilles at gmail.com> a écrit :
>
> Hi all,
>
> Git master code is now the 7.2.0 development branch.
>
> I just merged back the Kartik development branch to master.
>
> Best
>
> Gilles
>
> Le jeu. 3 sept. 2020 à 06:45, Gilles Caulier
> <caulier.gilles at gmail.com> a écrit :
> >
> > Hi all,
> >
> > digiKam from git master is now tagged with v7.1.0.
> >
> > 7.1.0 release files will be generated soon and published on official
> > download area
> >
> > Best
> >
> > Gilles
> >
> > Le jeu. 3 sept. 2020 à 04:34, Gilles Caulier
> > <caulier.gilles at gmail.com> a écrit :
> > >
> > > Hi all,
> > >
> > > After one week of work, I finally restored the MacOS build workflow by
> > > reversing the XCode version. Apple has simply forwarded a beta  update
> > > to the users in AppStore and of course i updated without a double
> > > check. AppStore must propose a stable version, not beta version !
> > >
> > > Now all compile and run fine. I tag 7.1.0 on git and prepare final
> > > files for the release targeted to Sunday.
> > >
> > > Best
> > >
> > > Gilles
> > >
> > > Le mar. 1 sept. 2020 à 09:34, Gilles Caulier
> > > <caulier.gilles at gmail.com> a écrit :
> > > >
> > > > Hi all,
> > > >
> > > > I'm facing a problem, step by step with the Macports packages. I
> > > > updated Xcode to last stable, and now plenty of packages are broken at
> > > > compile time. I report these problems one by one to Macports bugzilla.
> > > > It advances but slowly. So It's possible that I will delay until next
> > > > week end the release.
> > > >
> > > > The problem with Macports is that we cannot go back to a previous
> > > > version of a package, and when a package compilation is broken, it's
> > > > generally a good idea to recompile all from scratch, to be sure, due
> > > > to side effects.
> > > >
> > > > To conclude, before to release a major version of digiKam:
> > > >
> > > > NEVER update Apple compiler.
> > > > NEVER recompile whole Macports.
> > > > NEVER update MacOS even if there are security issues.
> > > > etc...
> > > >
> > > > It's always a waste of time...
> > > >
> > > > Best
> > > >
> > > > Gilles
> > > >
> > > > Le lun. 31 août 2020 à 10:04, Gilles Caulier
> > > > <caulier.gilles at gmail.com> a écrit :
> > > > >
> > > > > Hi all,
> > > > >
> > > > > This morning, i think the MacOS build will be fixed, after 3 days of
> > > > > intensive search. In fact the XCode compiler was badly updating a
> > > > > signature on the computer and Macports was unable to detect the right
> > > > > compiler version and fail to compile a few packages.
> > > > >
> > > > > I will tag 7.1.0 now and start to merge students' branches to master
> > > > > as planed : Kartik in first and Nghia in second.
> > > > >
> > > > > 7.2.0 developpement will be ready to start soon. I will release 7.1.0
> > > > > tarball and bundles using the git tag as well. I need to check if all
> > > > > compile fine from the Application first.When all is ready i will send
> > > > > another mail here...
> > > > >
> > > > > Best
> > > > >
> > > > > Gilles
> > > > >
> > > > > Le mar. 25 août 2020 à 06:11, Thanh Trung Dinh
> > > > > <dinhthanhtrung1996 at gmail.com> a écrit :
> > > > > >
> > > > > > Hi Gilles,
> > > > > >
> > > > > > Yes, I think this is the most stable way. Since Nghia has also worked on some interfaces between facesmanagement and facesengines, merging his branch at last is more appropriate.
> > > > > >
> > > > > > Best,
> > > > > >
> > > > > > On Tue, Aug 25, 2020, 10:13 Gilles Caulier <caulier.gilles at gmail.com> wrote:
> > > > > >>
> > > > > >> Hi all,
> > > > > >>
> > > > > >> We are near 7.1.0. This one will be a maintenance release with
> > > > > >> improvements and a huge bugs triaging.
> > > > > >>
> > > > > >> I plan to release 7.1.0 this weekend if AppImage build is restored.
> > > > > >> Currently all is broken with a Qt 5.15 migration which does not work.
> > > > > >> I revert all to Qt 5.14.2.
> > > > > >>
> > > > > >> When 7.1.0 will be tagged, it will be time to merge student branches to master.
> > > > > >>
> > > > > >> I propose to merge back Kartik branch, synchronise Nghia branch with
> > > > > >> master, fix build, and merge back Nghia branch to master.
> > > > > >>
> > > > > >> This plan is fine for you ?
> > > > > >>
> > > > > >> Best regards
> > > > > >>
> > > > > >> Gilles