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.

Sign up for GitHub

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

Jump to bottom

feat: Utilize globally installed leveldb if available #134

Merged
merged 4 commits into from
Feb 14, 2023
Merged

feat: Utilize globally installed leveldb if available #134

merged 4 commits into from
Feb 14, 2023

Conversation

phated
Copy link
Contributor

@phated phated commented Feb 7, 2023

Description

This allows leveldb to be provided globally in environments where there is no network access or where the sandbox cannot be changed (e.g. nix) during the building of the package. This is done through FetchContent_MakeAvailable which can be used in combination with FIND_PACKAGE_ARGS to start with a find_package search before trying to fetch from the network.

This changes requires a CMake minimum version upgrade because FIND_PACKAGE_ARGS wasn't added until v3.24 as documented at https://cmake.org/cmake/help/latest/module/FetchContent.html#command:fetchcontent_declare. Does anyone know which version of CMake is being used in the docker containers?

Checklist:

  • I have reviewed my diff in github, line by line.
  • Every change is related to the PR description.
  • I have linked this pull request to the issue(s) that it resolves.
  • There are no unexpected formatting changes, superfluous debug logs, or commented-out code.
  • There are no circuit changes, OR specifications in /markdown/specs have been updated.
  • There are no circuit changes, OR a cryptographer has been assigned for review.
  • I've updated any terraform that needs updating (e.g. environment variables) for deployment.
  • The branch has been rebased against the head of its merge target.
  • I'm happy for the PR to be merged at the reviewer's next convenience.
  • New functions, classes, etc. have been documented according to the doxygen comment format. Classes and structs must have @brief describing the intended functionality.
  • If existing code has been modified, such documentation has been added or updated.

@phated phated requested review from charlielye and dbanks12 February 7, 2023 23:35
@phated
Copy link
Contributor Author

phated commented Feb 8, 2023

It looks like the answer to "what cmake files in docker" is 3.16.3 due to the test failures.

@phated phated force-pushed the phated/global-leveldb branch from 10f7eb4 to a9d73d6 Compare February 13, 2023 23:32
@phated phated force-pushed the phated/global-leveldb branch from a9d73d6 to 9b23037 Compare February 14, 2023 00:09
dbanks12
dbanks12 approved these changes Feb 14, 2023
View reviewed changes
Copy link
Contributor

@dbanks12 dbanks12 left a comment

Choose a reason for hiding this comment

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

looks good to me

cpp/src/aztec/stdlib/merkle_tree/CMakeLists.txt Show resolved Hide resolved
@dbanks12 dbanks12 merged commit 255dfb5 into master Feb 14, 2023
@dbanks12 dbanks12 deleted the phated/global-leveldb branch February 14, 2023 17:22
phated added a commit that referenced this pull request Feb 14, 2023
@phated
Revert "feat: Utilize globally installed leveldb if available (#134)"
8b7e190 
This reverts commit 255dfb5.
@dbanks12 dbanks12 mentioned this pull request Feb 15, 2023
Closed
11 tasks
@phated phated mentioned this pull request Feb 15, 2023
Merged
11 tasks
@github-actions github-actions bot mentioned this pull request Jun 15, 2023
Merged
@github-actions github-actions bot mentioned this pull request Jul 11, 2023
Merged
ludamad pushed a commit to AztecProtocol/aztec-packages that referenced this pull request Jul 22, 2023
@phated
feat: Utilize globally installed leveldb if available (AztecProtocol/…
4cb103c 
…barretenberg#134)

* feat: Utilize globally installed leveldb if available

* chore: Update docs

* chore(docker): Update wasm builder to ubuntu:kinetic for newer cmake

* chore: Cleanup fragile target linking
ludamad pushed a commit to AztecProtocol/aztec-packages that referenced this pull request Jul 24, 2023
@phated
feat: Utilize globally installed leveldb if available (AztecProtocol/…
391eb50 
…barretenberg#134)

* feat: Utilize globally installed leveldb if available

* chore: Update docs

* chore(docker): Update wasm builder to ubuntu:kinetic for newer cmake

* chore: Cleanup fragile target linking
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dbanks12 dbanks12 dbanks12 approved these changes

@charlielye charlielye Awaiting requested review from charlielye

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@phated @dbanks12