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(cmake): Add Homebrew path detection for mariadb-connector-c to fix macOS build failure. #582

Merged
merged 5 commits into from
Nov 10, 2024

Conversation

LinZhihao-723
Copy link
Member

@LinZhihao-723 LinZhihao-723 commented Nov 10, 2024

Description

Recent macOS build workflow failed due to the version bump of mariadb-connector-c: https://github.com/y-scope/clp/actions/runs/11760063129
The detailed log message:

==> Installing mariadb-connector-c
==> Pouring mariadb-connector-c--3.4.1_1.arm64_sonoma.bottle.tar.gz
==> Caveats
mariadb-connector-c is keg-only, which means it was not symlinked into /opt/homebrew,
because it conflicts with mariadb.

If you need to have mariadb-connector-c first in your PATH, run:
  echo 'export PATH="/opt/homebrew/opt/mariadb-connector-c/bin:$PATH"' >> /Users/runner/.bash_profile

For compilers to find mariadb-connector-c you may need to set:
  export LDFLAGS="-L/opt/homebrew/opt/mariadb-connector-c/lib"
  export CPPFLAGS="-I/opt/homebrew/opt/mariadb-connector-c/include"

For pkg-config to find mariadb-connector-c you may need to set:
  export PKG_CONFIG_PATH="/opt/homebrew/opt/mariadb-connector-c/lib/pkgconfig"

This PR fixes the issue by changing the cmake file to detect mariadb-connector-c's homebrew path on macOS if PkgConfig failed to locate mariadb client.

Validation performed

Summary by CodeRabbit

  • New Features

    • Improved detection of the MariaDB client library on macOS systems.
    • Enhanced error handling with clearer feedback if the library is not found.
  • Bug Fixes

    • Resolved issues with package configuration checks for the MariaDB client library.

Copy link
Contributor

coderabbitai bot commented Nov 10, 2024

Walkthrough

The changes introduce enhancements to the FindMariaDBClient.cmake module, specifically to improve the detection of the MariaDB client library on macOS systems. A new conditional block has been added to check for the mariadbclient_PKGCONF_FOUND variable and, if it is not set, to retrieve the installation prefix using Homebrew. The script updates the CMAKE_PREFIX_PATH and attempts to check for the package configuration again. If the library is still not found, a fatal error message is generated to improve error handling.

Changes

File Path Change Summary
components/core/cmake/Modules/FindMariaDBClient.cmake Enhanced detection logic for the MariaDB client library on macOS, including checks for mariadbclient_PKGCONF_FOUND and retrieval of installation prefix via Homebrew. Improved error handling with a fatal error message if the library is not found.

Suggested reviewers

  • kirkrodrigues

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between e882a49 and a0fcffe.

📒 Files selected for processing (1)
  • components/core/cmake/Modules/FindMariaDBClient.cmake (1 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • components/core/cmake/Modules/FindMariaDBClient.cmake

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

endif()

if(NOT mariadbclient_PKGCONF_FOUND)
message(FATAL_ERROR "pkg_config cannot find mariadb")
Copy link
Member Author

Choose a reason for hiding this comment

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

This is a placeholder error message. May need a more meaningful fatal log

execute_process(COMMAND brew --prefix mariadb-connector-c OUTPUT_VARIABLE mariadb_MACOS_PREFIX)
string(STRIP "${mariadb_MACOS_PREFIX}" mariadb_MACOS_PREFIX)
set(CMAKE_PREFIX_PATH "${mariadb_MACOS_PREFIX};${CMAKE_PREFIX_PATH}")
pkg_check_modules(mariadbclient_PKGCONF QUIET "lib${mariadbclient_LIBNAME}")
Copy link
Member Author

Choose a reason for hiding this comment

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

We might not need QUIET here

Suggested change
pkg_check_modules(mariadbclient_PKGCONF QUIET "lib${mariadbclient_LIBNAME}")
pkg_check_modules(mariadbclient_PKGCONF "lib${mariadbclient_LIBNAME}")

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🧹 Outside diff range and nitpick comments (1)
components/core/cmake/Modules/FindMariaDBClient.cmake (1)

30-32: Enhance error message with platform-specific guidance

The error message should provide platform-specific installation instructions to help users resolve the issue.

Consider this improved implementation:

 if(NOT mariadbclient_PKGCONF_FOUND)
-    message(FATAL_ERROR "pkg_config cannot find mariadb")
+    if(APPLE)
+        message(FATAL_ERROR "pkg_config cannot find mariadb. Please ensure mariadb-connector-c is installed via Homebrew: brew install mariadb-connector-c")
+    else()
+        message(FATAL_ERROR "pkg_config cannot find mariadb. Please ensure mariadb-connector-c development package is installed on your system")
+    endif()
 endif()
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 7ea3941 and e882a49.

📒 Files selected for processing (1)
  • components/core/cmake/Modules/FindMariaDBClient.cmake (1 hunks)
🔇 Additional comments (1)
components/core/cmake/Modules/FindMariaDBClient.cmake (1)

23-32: Verify the fix resolves the macOS workflow failure

The implementation looks correct for handling keg-only Homebrew formulae. Let's verify the changes resolve the specific workflow failure.

✅ Verification successful

Implementation correctly handles keg-only MariaDB Connector/C on macOS

The changes are well-implemented and follow established patterns in the codebase. The solution:

  • Properly handles keg-only Homebrew formulae by using brew --prefix
  • Follows the same approach used for other dependencies (e.g., libarchive) in the codebase
  • Maintains the pkg-config workflow while adding macOS-specific handling
  • Preserves compatibility with other platforms through conditional execution
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify the CMake configuration works with the Homebrew-installed mariadb-connector-c

# Test: Check if the error message appears in recent workflow runs
gh run list --workflow ".github/workflows/macos.yml" --limit 5 --json conclusion,databaseId | \
  jq -r '.[] | select(.conclusion=="failure") | .databaseId' | \
  while read -r run_id; do
    gh run view "$run_id" --log | grep -A 5 "pkg_config cannot find mariadb"
  done

Length of output: 282


Script:

#!/bin/bash
# Let's verify the CMake configuration and MariaDB client handling

# Check for any existing MariaDB client configurations
fd -e cmake -e txt "MariaDB" -X cat {}

# Look for pkg-config related configurations
rg -A 5 "pkg_check_modules" 

# Check for any other Homebrew-related configurations
rg -A 5 "brew.*prefix"

Length of output: 10699

components/core/cmake/Modules/FindMariaDBClient.cmake Outdated Show resolved Hide resolved
@LinZhihao-723 LinZhihao-723 merged commit 4446eb5 into y-scope:main Nov 10, 2024
20 checks passed
LinZhihao-723 added a commit to LinZhihao-723/clp that referenced this pull request Nov 12, 2024
* ffi: Add support for serializing/deserializing auto-generated and user-generated schema tree node IDs. (y-scope#557)

Co-authored-by: kirkrodrigues <[email protected]>

* clp: Add missing C++ standard library includes in IR parsing files. (y-scope#561)

Co-authored-by: kirkrodrigues <[email protected]>

* log-viewer-webui: Update `yscope-log-viewer` to the latest version (which uses `clp-ffi-js`). (y-scope#562)

* package: Upgrade dependencies to resolve security issues. (y-scope#536)

* clp-s: Implement table packing (y-scope#466)

Co-authored-by: wraymo <[email protected]>
Co-authored-by: Kirk Rodrigues <[email protected]>
Co-authored-by: wraymo <[email protected]>

* log-viewer-webui: Update `yscope-log-viewer` to the latest version. (y-scope#565)

* ci: Switch GitHub macOS build workflow to use macos-13 (x86) and macos-14 (ARM) runners. (y-scope#566)

* core: Add support for user-defined HTTP headers in `NetworkReader`. (y-scope#568)

Co-authored-by: Lin Zhihao <[email protected]>
Co-authored-by: Xiaochong Wei <[email protected]>

* chore: Update to the latest version of yscope-dev-utils. (y-scope#574)

* build(core): Upgrade msgpack to v7.0.0. (y-scope#575)

* feat(ffi): Update IR stream protocol version handling in preparation for releasing the kv-pair IR stream format: (y-scope#573)

- Bump the IR stream protocol version to 0.1.0 for the kv-pair IR stream format.
- Treat the previous IR stream format's versions as backwards compatible.
- Differentiate between backwards-compatible and supported versions during validation.

Co-authored-by: kirkrodrigues <[email protected]>

* fix(taskfiles): Trim trailing slash from URL prefix in `download-and-extract-tar` (fixes y-scope#577). (y-scope#578)

* fix(ffi): Correct `clp::ffi::ir_stream::Deserializer::deserialize_next_ir_unit`'s return value when failing to read the next IR unit's type tag. (y-scope#579)

* fix(taskfiles): Update `yscope-log-viewer` sources in `log-viewer-webui-clients` sources list (fixes y-scope#576). (y-scope#580)

* fix(cmake): Add Homebrew path detection for `mariadb-connector-c` to fix macOS build failure. (y-scope#582)

Co-authored-by: kirkrodrigues <[email protected]>

* refactor(ffi): Make `get_schema_subtree_bitmap` a public method of `KeyValuePairLogEvent`. (y-scope#581)

* ci: Schedule GitHub workflows to daily run to detect failures due to upgraded dependencies or environments. (y-scope#583)

* docs: Update the required version of task. (y-scope#567)

* Add pr check workflow

---------

Co-authored-by: kirkrodrigues <[email protected]>
Co-authored-by: Junhao Liao <[email protected]>
Co-authored-by: Henry8192 <[email protected]>
Co-authored-by: Devin Gibson <[email protected]>
Co-authored-by: wraymo <[email protected]>
Co-authored-by: wraymo <[email protected]>
Co-authored-by: Xiaochong(Eddy) Wei <[email protected]>
Co-authored-by: Xiaochong Wei <[email protected]>
Co-authored-by: haiqi96 <[email protected]>
jackluo923 pushed a commit to jackluo923/clp that referenced this pull request Dec 4, 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.

2 participants