Skip to content

Conversation

@alt-graph
Copy link
Member

For historic Meson versions, we need to add an explicit fallback tag to the catch2 dependency. Catch2 is available in the needed form since version 3.4.1, not 3.4.0.

Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

This PR ensures compatibility with older Meson releases by requiring Catch2 ≥3.4.1 and adding an explicit fallback, and updates the Catch2 wrap to file-based distribution at version 3.8.1.

  • Bump Catch2 dependency version to >=3.4.1 and add a fallback clause in tests/meson.build
  • Convert catch2.wrap from git-based to file-based wrap for Catch2 v3.8.1 and adjust provided dependency names

Reviewed Changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File Description
tests/meson.build Updated Catch2 dependency version and added fallback tag
subprojects/catch2.wrap Swapped to [wrap-file] for Catch2 v3.8.1 and renamed provide entries
Comments suppressed due to low confidence (2)

subprojects/catch2.wrap:11

  • The provided dependency name uses a hyphen (catch2-with-main) instead of the original underscore (catch2_with_main). Renaming it back to catch2_with_main maintains consistency with existing wraps and avoids breaking consumers.
catch2-with-main = catch2_with_main_dep

tests/meson.build:15

  • [nitpick] Consider adding a brief comment explaining why the fallback is needed for historic Meson versions to improve maintainability and onboarding.
dependency('catch2', version : '>=3.4.1',

For historic Meson versions, we need to add an explicit fallback tag to
the dependency. Catch2 is available in the needed form since version
3.4.1, not 3.4.0.

Signed-off-by: Lars Froehlich <lars.froehlich@desy.de>
@alt-graph alt-graph force-pushed the add_catch2_fallback branch from b4b4f9c to b2019b6 Compare June 16, 2025 07:22
@alt-graph
Copy link
Member Author

Thanks, @Finii!

@alt-graph alt-graph merged commit 5c30c63 into main Jun 16, 2025
2 checks passed
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