Skip to content

Commit

Permalink
chore: barretenberg in the monorepo
Browse files Browse the repository at this point in the history
See #1126 for motivation.
  • Loading branch information
ludamad committed Jul 23, 2023
2 parents e6533b1 + 4638333 commit a46419e
Show file tree
Hide file tree
Showing 1,850 changed files with 296,740 additions and 90 deletions.
313 changes: 266 additions & 47 deletions .circleci/config.yml

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions .github/workflows/mirror_docs_repo.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Push to docs-mirror-test branch
name: Mirror to docs repo

on:
push:
Expand Down Expand Up @@ -26,5 +26,9 @@ jobs:
# identify ourselves, needed to commit
git config --global user.email "[email protected]"
git config --global user.name "AztecBot"
# push to subrepo, commit locally
# push to subrepo, commit locally. The commit is lost
# when the github action ends, however it is not needed
# to continue to replay. If we do hit issues such as this
# action failing due to upstream changes, a manual resolution
# PR with ./scripts/git_subrepo.sh pull will be needed.
./scripts/git_subrepo.sh push $SUBREPO_PATH --branch=main
17 changes: 13 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,15 +1,24 @@
[submodule "build-system"]
path = build-system
url = [email protected]:AztecProtocol/build-system.git
[submodule "barretenberg"]
path = circuits/cpp/barretenberg
url = [email protected]:AztecProtocol/barretenberg.git
[submodule "legacy-nested-build-system"]
[submodule "legacy-nested-build-system1"]
path = circuits/build-system
url = [email protected]:AztecProtocol/build-system.git
[submodule "legacy-nested-build-system2"]
path = circuits/cpp/barretenberg/build-system
url = [email protected]:AztecProtocol/build-system.git
[submodule "l1-contracts/lib/openzeppelin-contracts"]
path = l1-contracts/lib/openzeppelin-contracts
url = https://github.com/openzeppelin/openzeppelin-contracts
[submodule "l1-contracts/lib/forge-std"]
path = l1-contracts/lib/forge-std
url = https://github.com/foundry-rs/forge-std
[submodule "circuits/cpp/barretenberg/sol/lib/forge-std"]
path = circuits/cpp/barretenberg/sol/lib/forge-std
url = https://github.com/foundry-rs/forge-std
[submodule "circuits/cpp/barretenberg/sol/lib/solidity-stringutils"]
path = circuits/cpp/barretenberg/sol/lib/solidity-stringutils
url = https://github.com/Arachnid/solidity-stringutils
[submodule "circuits/cpp/barretenberg/sol/lib/openzeppelin-contracts"]
path = circuits/cpp/barretenberg/sol/lib/openzeppelin-contracts
url = https://github.com/OpenZeppelin/openzeppelin-contracts
48 changes: 47 additions & 1 deletion build_manifest.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,50 @@
{
"barretenberg-x86_64-linux-clang": {
"buildDir": "circuits/cpp/barretenberg/cpp",
"dockerfile": "dockerfiles/Dockerfile.x86_64-linux-clang",
"rebuildPatterns": ["^circuits/cpp/barretenberg/cpp/"],
"dependencies": []
},
"barretenberg-x86_64-linux-clang-assert": {
"buildDir": "circuits/cpp/barretenberg/cpp",
"dockerfile": "dockerfiles/Dockerfile.x86_64-linux-clang-assert",
"rebuildPatterns": ["^circuits/cpp/barretenberg/cpp/"],
"dependencies": []
},
"barretenberg-x86_64-linux-gcc": {
"buildDir": "circuits/cpp/barretenberg/cpp",
"dockerfile": "dockerfiles/Dockerfile.x86_64-linux-gcc",
"rebuildPatterns": ["^circuits/cpp/barretenberg/cpp/"],
"dependencies": []
},
"barretenberg-wasm-linux-clang": {
"buildDir": "circuits/cpp/barretenberg/cpp",
"dockerfile": "dockerfiles/Dockerfile.wasm-linux-clang",
"rebuildPatterns": ["^circuits/cpp/barretenberg/cpp/"],
"dependencies": []
},
"barretenberg-circuits-x86_64-linux-clang-builder-runner": {
"buildDir": "circuits/cpp/barretenberg/cpp",
"dockerfile": "dockerfiles/Dockerfile.circuits-x86_64-linux-clang-builder-runner",
"rebuildPatterns": ["^circuits/cpp/barretenberg/cpp/"],
"dependencies": []
},
"barretenberg-circuits-wasm-linux-clang-builder-runner": {
"buildDir": "circuits/cpp/barretenberg/cpp",
"dockerfile": "dockerfiles/Dockerfile.circuits-wasm-linux-clang-builder-runner",
"rebuildPatterns": ["^circuits/cpp/barretenberg/cpp/"],
"dependencies": []
},
"bb.js": {
"buildDir": "circuits/cpp/barretenberg/ts",
"rebuildPatterns": ["^circuits/cpp/barretenberg/ts/"],
"dependencies": ["barretenberg-wasm-linux-clang"]
},
"barretenberg-acir-tests": {
"buildDir": "circuits/cpp/barretenberg/acir_tests",
"rebuildPatterns": ["^circuits/cpp/barretenberg/acir_tests/"],
"dependencies": ["bb.js", "barretenberg-x86_64-linux-clang-assert"]
},
"circuits-wasm-linux-clang": {
"buildDir": "circuits/cpp",
"dockerfile": "dockerfiles/Dockerfile.wasm-linux-clang",
Expand Down Expand Up @@ -392,4 +438,4 @@
"types"
]
}
}
}
2 changes: 1 addition & 1 deletion circuits/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ node_modules
.yarn/cache
.yarn/install-state.gz
ts/dest
/build
/build
1 change: 0 additions & 1 deletion circuits/cpp/barretenberg
Submodule barretenberg deleted from af91bc
Loading

0 comments on commit a46419e

Please sign in to comment.