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

Pin cxxbridge tool at v 1.0.68 to match Cargo.lock. #3585

Merged
merged 1 commit into from
Nov 2, 2022

Conversation

dmkozh
Copy link
Contributor

@dmkozh dmkozh commented Oct 25, 2022

Description

Pin cxxbridge tool at v 1.0.68 to match cxx crates in Cargo.lock.

Ideally we would do that automatically, but that addresses the issue of version mismatch for the time being.

Checklist

  • Reviewed the contributing document
  • Rebased on top of master (no merge commits)
  • Ran clang-format v8.0.0 (via make format or the Visual Studio extension)
  • Compiles
  • Ran all tests
  • If change impacts performance, include supporting evidence per the performance document

Ideally we would do that automatically, but that addresses the issue of version mismatch for the time being.
@@ -76,7 +76,7 @@ stellar_core_LDADD += $(LIBRUST_STELLAR_CORE) -ldl

$(RUST_CXXBRIDGE):
mkdir -p $(RUST_BIN_DIR)
$(CARGO) install --root $(RUST_BUILD_DIR) cxxbridge-cmd
$(CARGO) install --root $(RUST_BUILD_DIR) cxxbridge-cmd --version 1.0.68
Copy link
Member

@leighmcculloch leighmcculloch Oct 25, 2022

Choose a reason for hiding this comment

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

Fyi if you want to extract this from the Cargo.lock file so you don't have to manually keep it in sync, you can use this command, or something like this:

cargo metadata --format-version 1 | jq -r '.packages[] | select(.name == "cxx") | .version'

I don't know how anything like that could be applied to the VisualStudio project file, but this would work for the Makefile at least.

@MonsieurNicolas
Copy link
Contributor

r+ 3c16f19

@latobarita latobarita merged commit ef6285d into stellar:master Nov 2, 2022
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.

4 participants