Skip to content

Commit

Permalink
chore(test): Runs all noir test vectors against bb and bb.js in ci. (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
charlielye authored Jul 8, 2023
1 parent 19e672e commit b083531
Show file tree
Hide file tree
Showing 24 changed files with 2,652 additions and 28 deletions.
17 changes: 16 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,6 @@ jobs:
- run:
name: "Test"
command: cond_spot_run_test_script ./scripts/bin-test.sh barretenberg-x86_64-linux-clang-assert
- *save_logs

benchmark-aggregator:
docker:
Expand Down Expand Up @@ -314,6 +313,17 @@ jobs:
name: "Test"
command: cond_spot_run_tests bb.js

acir-tests:
docker:
- image: aztecprotocol/alpine-build-image
resource_class: small
steps:
- *checkout
- *setup_env
- run:
name: "Build and test"
command: cond_spot_run_build acir-tests 32

# These machines cost a fortune (10x other machines).
# There is a branch coming for github actions that will build mac stuff on releases.
# I'll leave this here for now, just in case proves useful to be able to do CI mac builds on branches,
Expand Down Expand Up @@ -450,6 +460,11 @@ workflows:
requires:
- bb-js
<<: *defaults
- acir-tests:
requires:
- x86_64-linux-clang-assert
- bb-js
<<: *defaults
#- circuits-wasm-linux-clang-builder-runner: *notmaster
- circuits-x86_64-linux-clang-builder-runner: *notmaster
#- circuits-wasm-tests:
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ node_modules
ts/dest
.tsbuildinfo
.idea
cmake-build-debug
cmake-build-debug
3 changes: 0 additions & 3 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,7 @@
"**/.pnp.*": true,
"**/msgpack-c/**": true
},
"typescript.tsdk": "ts/.yarn/sdks/typescript/lib",
"typescript.enablePromptUseWorkspaceTsdk": true,
"eslint.nodePath": "ts/.yarn/sdks",
"prettier.prettierPath": "ts/.yarn/sdks/prettier/index.js",
"[cpp]": {
// doesn't conflict with barratenberg.code-workspace settings.
"editor.defaultFormatter": "llvm-vs-code-extensions.vscode-clangd"
Expand Down
2 changes: 2 additions & 0 deletions acir_tests/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
acir_tests
acir-to-bberg-circuit/target
1 change: 1 addition & 0 deletions acir_tests/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
acir_tests
18 changes: 18 additions & 0 deletions acir_tests/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/barretenberg-x86_64-linux-clang-assert
FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/bb.js

FROM rust:alpine as atbbc
RUN apk update && apk add musl-dev
WORKDIR /usr/src/barretenberg/acir_tests
COPY acir-to-bberg-circuit acir-to-bberg-circuit
RUN cd acir-to-bberg-circuit && cargo build --release

FROM node:18-alpine
RUN apk update && apk add git bash curl
COPY --from=0 /usr/src/barretenberg/cpp/build /usr/src/barretenberg/cpp/build
COPY --from=1 /usr/src/barretenberg/ts /usr/src/barretenberg/ts
COPY --from=2 /usr/src/barretenberg/acir_tests/acir-to-bberg-circuit /usr/src/barretenberg/acir_tests/acir-to-bberg-circuit
WORKDIR /usr/src/barretenberg/acir_tests
COPY . .
RUN ./run_acir_tests.sh
RUN BB=../ts/dest/main.js ./run_acir_tests.sh
1 change: 1 addition & 0 deletions acir_tests/acir-to-bberg-circuit/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/target
Loading

0 comments on commit b083531

Please sign in to comment.