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

feat: enable sol verifier tests in ci #2997

Merged
merged 9 commits into from
Oct 25, 2023
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,17 @@ jobs:
name: "Build"
command: cond_spot_run_build barretenberg-x86_64-linux-clang-assert 128

barretenberg-x86_64-linux-clang-sol:
docker:
- image: aztecprotocol/alpine-build-image
resource_class: small
steps:
- *checkout
- *setup_env
- run:
name: "Build"
command: cond_spot_run_build barretenberg-x86_64-linux-clang-sol 128

ludamad marked this conversation as resolved.
Show resolved Hide resolved
barretenberg-stdlib-tests:
docker:
- image: aztecprotocol/alpine-build-image
Expand Down Expand Up @@ -1143,6 +1154,7 @@ workflows:
- barretenberg-x86_64-linux-clang-assert: *defaults
- barretenberg-x86_64-linux-clang-fuzzing: *defaults
- barretenberg-wasm-linux-clang: *defaults
- barretenberg-x86_64-linux-clang-sol: *defaults
- barretenberg-proof-system-tests: *bb_test
- barretenberg-honk-tests: *bb_test
- barretenberg-dsl-tests: *bb_test
Expand Down
3 changes: 3 additions & 0 deletions barretenberg/.dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ sol/cache
sol/out
sol/Dockerfile
sol/lib
sol/.foundry
sol/cache
sol/out
cpp/build
cpp/srs_db/ignition
.gitmodules
2 changes: 1 addition & 1 deletion barretenberg/sol/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ out/
.vscode/settings.json
.foundry

build/
**/build*/*
7 changes: 7 additions & 0 deletions barretenberg/sol/.rebuild_patterns
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
^barretenberg/cpp/.*\.(cpp|cc|cxx|c\+\+|h|hpp|hxx|h\+\+|c|h|inl|inc|ipp|tpp|cmake)$
^barretenberg/cpp/.*CMakeLists\.txt$
^barretenberg/cpp/.*Dockerfile.*$
^barretenberg/cpp/scripts/
^barretenberg/sol/src/
^barretenberg/sol/scripts/
^barretenberg/sol/test/
6 changes: 3 additions & 3 deletions barretenberg/sol/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM alpine:3.17
FROM alpine:3.18
RUN apk update \
&& apk upgrade \
&& apk add --no-cache \
build-base \
clang15 \
clang16 \
openmp-dev \
cmake \
ninja \
Expand All @@ -15,7 +15,7 @@ WORKDIR /usr/src/barretenberg/cpp

COPY ./cpp .
# Build everything to ensure everything builds. All tests will be run from the result of this build.
RUN cmake --preset default && cmake --build --preset default --target solidity_key_gen solidity_proof_gen
RUN cmake --preset clang16 && cmake --build --preset clang16 --target solidity_key_gen solidity_proof_gen

FROM docker.io/frolvlad/alpine-glibc:alpine-3.17_glibc-2.34 as builder
RUN apk update && apk add git curl build-base openmp-dev bash
Expand Down
5 changes: 5 additions & 0 deletions build_manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ barretenberg-wasm-linux-clang:
dockerfile: dockerfiles/Dockerfile.wasm-linux-clang
rebuildPatterns: .rebuild_patterns

barretenberg-x86_64-linux-clang-sol:
buildDir: barretenberg
dockerfile: sol/Dockerfile
rebuildPatterns: sol/.rebuild_patterns

bb.js:
buildDir: barretenberg/ts
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion yellow-paper/docs/intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -235,4 +235,4 @@ The draft subsections are mere suggestions (and serve as a helpful reminder of t
- Bytecode commitment circuit [???]
- Smart Contracts [Lasse]
- ...
- Acknowledgements
- Acknowledgements