Fix buggy globbing rules in addon build #10076
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 whenCMAKE_CURRENT_SOURCE_DIR
andADDON_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