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

ci(flatpak): add flatpak builder lint #2799

Merged
merged 1 commit into from
Jul 7, 2024

Conversation

ReenigneArcher
Copy link
Member

@ReenigneArcher ReenigneArcher commented Jul 2, 2024

Description

Add flatpak manifest linting, per discussion from flathub/dev.lizardbyte.app.Sunshine#36 (comment)

Screenshot

Issues Fixed or Closed

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Dependency update (updates to dependencies)
  • Documentation update (changes to documentation)
  • Repository update (changes to repository files, e.g. .github/...)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated the in code docstring/documentation-blocks for new or existing methods/components

Branch Updates

LizardByte requires that branches be up-to-date before merging. This means that after any PR is merged, this branch
must be updated before it can be merged. You must also
Allow edits from maintainers.

  • I want maintainers to keep my branch updated

@ReenigneArcher ReenigneArcher force-pushed the ci(flatpak)-add-flatpak-builder-lint branch 6 times, most recently from e65590f to 939a103 Compare July 3, 2024 00:17
Copy link

codecov bot commented Jul 3, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 8.95%. Comparing base (acccacf) to head (9b4d191).

Additional details and impacted files
@@          Coverage Diff           @@
##           master   #2799   +/-   ##
======================================
  Coverage    8.95%   8.95%           
======================================
  Files          95      95           
  Lines       17386   17386           
  Branches     8268    8268           
======================================
  Hits         1557    1557           
  Misses      12964   12964           
  Partials     2865    2865           
Flag Coverage Δ
Linux 6.78% <ø> (ø)
Windows 4.16% <ø> (ø)
macOS-12 10.01% <ø> (ø)
macOS-13 9.92% <ø> (-0.02%) ⬇️
macOS-14 10.22% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

@ReenigneArcher ReenigneArcher force-pushed the ci(flatpak)-add-flatpak-builder-lint branch 4 times, most recently from eebf5ff to c53b29c Compare July 3, 2024 01:22
@ReenigneArcher ReenigneArcher marked this pull request as ready for review July 3, 2024 01:53
@ReenigneArcher ReenigneArcher force-pushed the ci(flatpak)-add-flatpak-builder-lint branch 12 times, most recently from 777e597 to a6ea337 Compare July 5, 2024 04:00
flatpak run --command=flatpak-builder-lint org.flatpak.Builder --exceptions manifest ${APP_ID}.yml

echo "Linting flatpak repo"
mirror_url="https://dl.flathub.org/media/dev/lizardbyte/app.Sunshine/453e7e848f225b26ce4d5f2500a806c1/screenshots/image-1_orig.webp"

Choose a reason for hiding this comment

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

should be just https://dl.flathub.org/media. We're discussing how to disable this check for builds not targetting Flathub.

Copy link
Member Author

Choose a reason for hiding this comment

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

Thank you!

I have one question. Is the "--exceptions" arg only going to allow exceptions that are for this flatpak id? Or it will pass any if the rule says exceptions allowed?

Copy link
Member Author

Choose a reason for hiding this comment

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

I must have missed something.

usage: flatpak-builder-lint [-h] [--version] [--exceptions] [--appid APPID]
                            [--cwd] [--ref REF]
                            {builddir,repo,manifest,appstream} path
flatpak-builder-lint: error: unrecognized arguments: --mirror-screenshots-url=https://dl.flathub.org/media

@ReenigneArcher ReenigneArcher force-pushed the ci(flatpak)-add-flatpak-builder-lint branch 4 times, most recently from 35bef65 to 0c63c2e Compare July 6, 2024 02:37
@ReenigneArcher ReenigneArcher force-pushed the ci(flatpak)-add-flatpak-builder-lint branch 11 times, most recently from 17a294a to 65c0d1b Compare July 6, 2024 21:57
@ReenigneArcher ReenigneArcher force-pushed the ci(flatpak)-add-flatpak-builder-lint branch from 65c0d1b to 9b4d191 Compare July 6, 2024 22:21
@ReenigneArcher
Copy link
Member Author

@gschintgen would you be able to test this PR? Mostly I'd like to ensure that deb or rpm packages didn't break due to any of the CMake changes.

@gschintgen
Copy link
Contributor

gschintgen commented Jul 6, 2024 via email

@gschintgen
Copy link
Contributor

I downloaded the last available deb from the CI here, that is the one before your (minor) last force push. It seems to work fine. I also checked out the PR locally and built it. I can't say there's anything out of the ordinary. But I only did very cursory testing (a few seconds of remote desktop.)

I had a quick look at sunshine.desktop and sunshine.service (since the respective .in files were modified) and they seem fine.

@ReenigneArcher ReenigneArcher merged commit 37b60fb into master Jul 7, 2024
49 checks passed
@ReenigneArcher ReenigneArcher deleted the ci(flatpak)-add-flatpak-builder-lint branch July 7, 2024 14:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants