MightyCreak / diffuse

Diffuse is a graphical tool for comparing and merging text files. It can retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK repositories.
http://mightycreak.github.io/diffuse/
GNU General Public License v2.0
258 stars 45 forks source link

Appdata and translation related patches #220

Closed ghost closed 6 months ago

ghost commented 6 months ago

appdata: Update appdata

po: Update Turkish translation

MightyCreak commented 6 months ago

I just fixed an issue with Python 3.12 (which might be the reason why the CI/CD fails on your MR). Could you rebase your branch?

MightyCreak commented 6 months ago

I merged #222 and rebased your branch on main. Apparently there is still an issue with the meson build. I think it's coming from the CI/CD configuration (maybe the appstreamcli doesn't exist or is too old). I'll check that.

MightyCreak commented 6 months ago

I found the issue!

I cherry-picked your changes and fixed the CI/CD here: #223

MightyCreak commented 6 months ago

I merged #223 and I rebased your branch on main. I think it should fix the CI/CD on your branch as well.

MightyCreak commented 6 months ago

Well... it still fails...

I don't understand why... I tried the command line in an ubuntu:22.04 container and it worked. I think I'll have to find a way to see what's written in the CI/CD log file.

But it's getting late now, I'll tackle that tomorrow ;)

MightyCreak commented 6 months ago

Ok, I got the artifact and here's the error:

W: io.github.mightycreak.Diffuse:50: url-invalid-type vcs-browser
   Invalid `type` property for this `url` tag. URLs of this type are not known in the AppStream
   specification.
MightyCreak commented 6 months ago

Well.. apparently I couldn't sleep until I found the source of the issue :sweat_smile:

The issue was that ubuntu-latest is Ubuntu 22.04, which has appstream 0.15, which is too old to handle URL type vcs-browser. So I changed the docker image to ubuntu-23.04 (until ubuntu-latest will point to 23.04 too).

It's fixed now! Merging your PR now!

Thanks!