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

Fix buggy globbing rules in addon build #10076

Merged
merged 1 commit into from
Nov 26, 2024
Merged

Fix buggy globbing rules in addon build #10076

merged 1 commit into from
Nov 26, 2024

Conversation

oskirby
Copy link
Collaborator

@oskirby oskirby commented Nov 26, 2024

Description

I have noticed that the flatpak builds started failing after merging #10064 due to a failure to build the test addons, which I failed to notice because the flatpak builds were kinda flaky lately anyways. The problem seems to be that we have a buggy use of GLOB_RECURSE in addons.cmake that doesn't include any glob patterns and can fail to match any addons when CMAKE_CURRENT_SOURCE_DIR and ADDON_SOURCE_DIR differ.

While we're at it, we don't need to use inline python to parse the ADDON_ID. We have since upgraded to CMake > 2.20 which now includes native support for JSON parsing.

Reference

Example build failure: https://github.com/mozilla-mobile/mozilla-vpn-client/actions/runs/12019520242/job/33506273223

Checklist

  • My code follows the style guidelines for this project
  • I have not added any packages that contain high risk or unknown licenses (GPL, LGPL, MPL, etc. consult with DevOps if in question)
  • I have performed a self review of my own code
  • I have commented my code PARTICULARLY in hard to understand areas
  • I have added thorough tests where needed

@oskirby oskirby requested review from mcleinman and strseb November 26, 2024 18:52
@oskirby oskirby marked this pull request as ready for review November 26, 2024 19:01
Copy link
Collaborator

@mcleinman mcleinman left a comment

Choose a reason for hiding this comment

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

Thanks 👍🏻

@oskirby oskirby merged commit f8323cc into main Nov 26, 2024
92 checks passed
@oskirby oskirby deleted the fix-addon-globing branch November 26, 2024 19:28
@mcleinman mcleinman mentioned this pull request Dec 2, 2024
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