Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

flatpak: bump GNOME depend to 47 #21025

Merged
merged 2 commits into from
Sep 19, 2024

Conversation

allisonkarlitskaya
Copy link
Member

@allisonkarlitskaya allisonkarlitskaya commented Sep 19, 2024

The new Sdk drops the old appstream-util command for favour of appstreamcli, so move to using it to validate our files.

Fixes flathub/org.cockpit_project.CockpitClient#46

@allisonkarlitskaya
Copy link
Member Author

appstream-util validate --nonet src/client/org.cockpit_project.CockpitClient.metainfo.xml
make: appstream-util: No such file or directory

bzzt

@allisonkarlitskaya allisonkarlitskaya added the no-test For doc/workflow changes, or experiments which don't need a full CI run, label Sep 19, 2024
The new Sdk drops the old appstream-util command for favour of
appstreamcli, so move to using it to validate our files.
We used to use this to disable the use of `.indent()` on our ElementTree
(since it wasn't available on the Ubuntu version in GitHub Actions). The
script which did that got removed in a33062f and this should have
gone with it.

Remove it now.
@allisonkarlitskaya
Copy link
Member Author

NB: this PR modifies the makefiles so in theory we could test it on all OSes but it only modifies the install-for-flatpak target, which should never run except inside of the flatpak build.

@martinpitt martinpitt added the .github-changes Set by a reviewer just before landing to acknowledge that a PR changes github workflows label Sep 19, 2024
Copy link
Member

@martinpitt martinpitt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! NB I haven't locally built/tested this visually, did you?

@allisonkarlitskaya
Copy link
Member Author

I built it and ran it, yes. Seems fine.

@allisonkarlitskaya allisonkarlitskaya merged commit 44a60b9 into cockpit-project:main Sep 19, 2024
32 of 33 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
.github-changes Set by a reviewer just before landing to acknowledge that a PR changes github workflows no-test For doc/workflow changes, or experiments which don't need a full CI run,
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bump up to GNOME 47
2 participants