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

chore: add native fdb library to path #2045

Open
wants to merge 1 commit into
base: chore_add_timeout_flag_to_docker-compose_down
Choose a base branch
from

Conversation

NathanFlurry
Copy link
Member

Changes

Copy link
Member Author

NathanFlurry commented Feb 19, 2025

Warning

This pull request is not mergeable via GitHub because a downstack PR is open. Once all requirements are satisfied, merge this PR as a stack on Graphite.
Learn more


How to use the Graphite Merge Queue

Add the label merge-queue to this PR to add it to the merge queue.

You must have a Graphite account in order to use the merge queue. Sign up using this link.

An organization admin has enabled the Graphite Merge Queue in this repository.

Please do not merge from GitHub as this will restart CI on PRs being processed by the merge queue.

This stack of pull requests is managed by Graphite. Learn more about stacking.

Copy link

@greptile-apps greptile-apps bot left a comment

Choose a reason for hiding this comment

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

PR Summary

This PR enhances cross-platform library path handling in shell.nix, focusing on proper FoundationDB integration across Darwin and Linux systems.

  • Added platform-specific library path variables (DYLD_LIBRARY_PATH for Darwin, LD_LIBRARY_PATH for Linux) in /shell.nix
  • Implemented conditional FoundationDB library path handling based on platform support
  • Added fallback system library path (/usr/local/lib) when FoundationDB is not supported

1 file(s) reviewed, 1 comment(s)
Edit PR Review Bot Settings | Greptile

'' else ''
# Manually check the FDB version
if [ -z "$(command -v fdbcli)" ]; then
echo "WARNING: FoundationDB CLI is not installed. Please install FoundationDB 7.1."
elif ! fdbcli --version 2>/dev/null | grep -q "FoundationDB CLI 7.1"; then
echo "WARNING: FoundationDB CLI version is incorrect. Please install FoundationDB 7.1."
fi

# Give access to system libraries
export LIBRARY_PATH="/usr/local/lib:$LIBRARY_PATH"
Copy link

Choose a reason for hiding this comment

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

style: Consider prepending to LIBRARY_PATH instead of appending to ensure system libraries don't override package libraries

Copy link

cloudflare-workers-and-pages bot commented Feb 19, 2025

Deploying rivet with  Cloudflare Pages  Cloudflare Pages

Latest commit: 030a024
Status:⚡️  Build in progress...

View logs

Copy link

cloudflare-workers-and-pages bot commented Feb 19, 2025

Deploying rivet-hub with  Cloudflare Pages  Cloudflare Pages

Latest commit: 030a024
Status: ✅  Deploy successful!
Preview URL: https://5776a49f.rivet-hub-7jb.pages.dev
Branch Preview URL: https://graphite-base-2049.rivet-hub-7jb.pages.dev

View logs

@NathanFlurry NathanFlurry changed the base branch from 02-15-feat_workflows_abstract_debug_trait to graphite-base/2045 February 19, 2025 05:16
@NathanFlurry NathanFlurry force-pushed the 02-18-chore_add_native_fdb_library_to_path branch from e832d02 to 8061121 Compare February 19, 2025 05:16
@NathanFlurry NathanFlurry changed the base branch from graphite-base/2045 to chore_add_timeout_flag_to_docker-compose_down February 19, 2025 05:17
@MasterPtato MasterPtato force-pushed the chore_add_timeout_flag_to_docker-compose_down branch from ebd711a to c85f6e8 Compare February 19, 2025 20:26
@MasterPtato MasterPtato force-pushed the 02-18-chore_add_native_fdb_library_to_path branch from 8061121 to ef80531 Compare February 19, 2025 20:26
This was referenced Feb 19, 2025
@MasterPtato MasterPtato force-pushed the chore_add_timeout_flag_to_docker-compose_down branch from c85f6e8 to fdf864b Compare February 20, 2025 01:56
@MasterPtato MasterPtato force-pushed the 02-18-chore_add_native_fdb_library_to_path branch from ef80531 to 030a024 Compare February 20, 2025 01:56
@NathanFlurry NathanFlurry force-pushed the 02-18-chore_add_native_fdb_library_to_path branch from 030a024 to ba236f2 Compare February 20, 2025 02:28
@MasterPtato MasterPtato force-pushed the chore_add_timeout_flag_to_docker-compose_down branch from 60ffaa2 to fdf864b Compare February 20, 2025 02:37
@MasterPtato MasterPtato force-pushed the 02-18-chore_add_native_fdb_library_to_path branch from ba236f2 to 030a024 Compare February 20, 2025 02:37
@NathanFlurry NathanFlurry force-pushed the 02-18-chore_add_native_fdb_library_to_path branch from 030a024 to ba236f2 Compare February 20, 2025 02:55
@NathanFlurry NathanFlurry changed the base branch from chore_add_timeout_flag_to_docker-compose_down to graphite-base/2045 February 20, 2025 03:50
@MasterPtato MasterPtato force-pushed the 02-18-chore_add_native_fdb_library_to_path branch from ba236f2 to 030a024 Compare February 20, 2025 22:01
Copy link

Deploying rivet with  Cloudflare Pages  Cloudflare Pages

Latest commit: 030a024
Status:⚡️  Build in progress...

View logs

Copy link

Deploying rivet with  Cloudflare Pages  Cloudflare Pages

Latest commit: 030a024
Status:🚫  Build failed.

View logs

Copy link

Deploying rivet with  Cloudflare Pages  Cloudflare Pages

Latest commit: 030a024
Status:🚫  Build failed.

View logs

@MasterPtato MasterPtato changed the base branch from graphite-base/2045 to chore_add_timeout_flag_to_docker-compose_down February 21, 2025 02:27
@NathanFlurry NathanFlurry force-pushed the 02-18-chore_add_native_fdb_library_to_path branch from 030a024 to ba236f2 Compare February 21, 2025 05:17
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.

1 participant