I've updated the deconflictor now https://build.neon.kde.org/job/test_kf6_deconflictor/lastSuccessfulBuild/artifact/conflict-report.json/*view*/
On Tue, 2 May 2023 at 09:35, David Edmundson <da...@davidedmundson.co.uk> wrote: > On Fri, Apr 28, 2023 at 5:59 PM Jonathan Riddell <j...@jriddell.org> wrote: > > > > The deconflictor job we run in neon still has a bunch of files > overlapping between kf5 and kf6 > > > > https://build.neon.kde.org/job/test_kf6_deconflictor/ > > > > > https://build.neon.kde.org/job/test_kf6_deconflictor/9/artifact/conflict-report.json/*view*/ > > > > Is there any progress being made in fixing this? > > Any, yes. > Obviously it's not done yet. > > I'm not sure this report is up to date: > > "/usr/kf6/bin/kglobalaccel5", > "/usr/bin/kglobalaccel5" > > I can't see us installing that. > > > We'd like to move the neon packages into /usr which would break our > deconflicting report job. > > You know how to make progress faster :) > > > Jonathan > > >
