Skip to content

Commit

Permalink
Merge branch 'master' into tf/fixed-length-black-box-arrays
Browse files Browse the repository at this point in the history 
* master:
  feat: Wire AVM gas used to public kernel (#5740)
  fix(ci,noir-projects): bring apt-get higher in cache (#5775)
  fix: e2e getStack, disable failing e2e (#5768)
  feat: Changing finite field arithmetic in wasm to 29 bits for multiplications (#5435)
  feat!: trap with revert data (#5732)
  feat: impl of missing functionality in new key store (#5750)
  git subrepo push --branch=master noir-projects/aztec-nr
  git_subrepo.sh: Fix parent in .gitrepo file. [skip ci]
  chore: replace relative paths to noir-protocol-circuits
  git subrepo push --branch=master barretenberg
  fix(ci): 192 core spot runner (#5767)
  feat(acir)!: BrilligCall opcode  (#5709)
  fix(ci): speculative deploy fix
  fix(ci): don't fail if can't prune
  feat(ci): turn on new CI as mandatory (#5761)
  • Loading branch information
@TomAFrench
TomAFrench committed Apr 16, 2024
2 parents d891577 + 4f55d10 commit 783feeb
Show file tree
Hide file tree
Showing 195 changed files with 3,649 additions and 1,440 deletions.
282 changes: 5 additions & 277 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,108 +181,6 @@ jobs:
command: |
barretenberg/cpp/scripts/ci/upload_doxygen_to_s3.sh
barretenberg-stdlib-tests:
docker:
- image: aztecprotocol/alpine-build-image
resource_class: small
steps:
- *checkout
- *setup_env
- run:
name: "Test"
command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/run_tests 1 stdlib-tests
aztec_manifest_key: barretenberg-x86_64-linux-clang-assert

barretenberg-dsl-tests:
docker:
- image: aztecprotocol/alpine-build-image
resource_class: small
steps:
- *checkout
- *setup_env
- run:
name: "Test"
command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/run_tests 1 dsl_tests
aztec_manifest_key: barretenberg-x86_64-linux-clang-assert

barretenberg-tests:
docker:
- image: aztecprotocol/alpine-build-image
resource_class: small
steps:
- *checkout
- *setup_env
- run:
name: "Test"
command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/bb-tests.sh
aztec_manifest_key: barretenberg-x86_64-linux-clang-assert

barretenberg-avm-tests:
docker:
- image: aztecprotocol/alpine-build-image
resource_class: small
steps:
- *checkout
- *setup_env
- run:
name: "Test"
command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/avm-tests.sh
aztec_manifest_key: barretenberg-x86_64-linux-clang-assert

barretenberg-bench:
machine:
# NOTE: we usually use alpine build image when making spot images, but
# we are not able to upload to S3 with it
image: default
resource_class: medium
steps:
- *checkout
- *setup_env
- run:
name: "Benchmark"
command: cond_spot_run_build barretenberg-bench 32
aztec_manifest_key: barretenberg-bench
- run:
name: "Upload"
command: |
barretenberg/cpp/scripts/ci/upload_benchmarks_to_s3.sh
barretenberg-proof-system-tests:
docker:
- image: aztecprotocol/alpine-build-image
resource_class: small
steps:
- *checkout
- *setup_env
- run:
name: "Test"
command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/run_tests 1 stdlib_circuit_builders_tests
aztec_manifest_key: barretenberg-x86_64-linux-clang-assert

barretenberg-stdlib-plonk-recursion-ultra-tests:
docker:
- image: aztecprotocol/alpine-build-image
resource_class: small
steps:
- *checkout
- *setup_env
- run:
name: "Test"
command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/run_tests 3 stdlib_plonk_recursion_tests --gtest_filter=-*turbo*
aztec_manifest_key: barretenberg-x86_64-linux-clang-assert

barretenberg-stdlib-honk-recursion-ultra-tests:
docker:
- image: aztecprotocol/alpine-build-image
resource_class: small
steps:
- *checkout
- *setup_env
- run:
name: "Test"
command: cond_spot_run_test barretenberg-x86_64-linux-clang-assert 32 ./scripts/run_tests 3 stdlib_honk_recursion_tests
aztec_manifest_key: barretenberg-x86_64-linux-clang-assert

bb-js:
machine:
image: default
Expand Down Expand Up @@ -629,136 +527,10 @@ jobs:
command: build end-to-end
aztec_manifest_key: end-to-end

e2e-tests:
steps:
- *checkout
- *setup_env
- run:
name: "Test"
command: cond_spot_run_container end-to-end 64 ./src/e2e*
aztec_manifest_key: end-to-end
<<: *defaults_e2e_test

e2e-sandbox-example:
steps:
- *checkout
- *setup_env
- run:
name: "Test"
command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=composed/e2e_sandbox_example.test.ts
aztec_manifest_key: end-to-end
<<: *defaults_e2e_test

uniswap-trade-on-l1-from-l2:
steps:
- *checkout
- *setup_env
- run:
name: "Test"
command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=composed/uniswap_trade_on_l1_from_l2.test.ts
aztec_manifest_key: end-to-end
<<: *defaults_e2e_test

integration-l1-publisher:
steps:
- *checkout
- *setup_env
- run:
name: "Test"
command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=composed/integration_l1_publisher.test.ts
aztec_manifest_key: end-to-end
<<: *defaults_e2e_test

e2e-persistence:
steps:
- *checkout
- *setup_env
- run:
name: "Test"
command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose-no-sandbox.yml TEST=composed/e2e_persistence.test.ts
aztec_manifest_key: end-to-end
<<: *defaults_e2e_test

e2e-browser:
steps:
- *checkout
- *setup_env
- run:
name: "Test"
command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=composed/e2e_aztec_js_browser.test.ts
aztec_manifest_key: end-to-end
<<: *defaults_e2e_test

pxe:
steps:
- *checkout
- *setup_env
- run:
name: "Test"
command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=composed/pxe.test.ts
aztec_manifest_key: end-to-end
<<: *defaults_e2e_test

cli-docs-sandbox:
steps:
- *checkout
- *setup_env
- run:
name: "Test"
command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=composed/cli_docs_sandbox.test.ts
aztec_manifest_key: end-to-end
<<: *defaults_e2e_test

e2e-docs-examples:
steps:
- *checkout
- *setup_env
- run:
name: "Test"
command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=composed/docs_examples.test.ts
aztec_manifest_key: end-to-end
<<: *defaults_e2e_test

guides-writing-an-account-contract:
steps:
- *checkout
- *setup_env
- run:
name: "Test"
command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=guides/writing_an_account_contract.test.ts
aztec_manifest_key: end-to-end
<<: *defaults_e2e_test

guides-dapp-testing:
steps:
- *checkout
- *setup_env
- run:
name: "Test"
command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=guides/dapp_testing.test.ts
aztec_manifest_key: end-to-end
<<: *defaults_e2e_test

guides-sample-dapp:
steps:
- *checkout
- *setup_env
- run:
name: "Test"
command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=sample-dapp
aztec_manifest_key: end-to-end
<<: *defaults_e2e_test

guides-up-quick-start:
steps:
- *checkout
- *setup_env
- run:
name: "Test"
command: cond_spot_run_compose end-to-end 4 ./scripts/docker-compose.yml TEST=guides/up_quick_start.test.ts
aztec_manifest_key: end-to-end
<<: *defaults_e2e_test
# For old e2e tests see yarn-project/end-to-end/Earthfile
# Semantics are similar to Dockerfile

# NOTE: Unlike other e2e, these will be re-enabled here as currently the logs functionality is not in the new earthfile setup
# bench-publish-rollup:
# steps:
# - *checkout
Expand Down Expand Up @@ -857,7 +629,7 @@ jobs:
command: |
should_deploy || exit 0
deploy_terraform_services iac/mainnet-fork mainnet-fork mainnet-fork aws_efs_file_system.aztec_mainnet_fork_data_store
./iac/scripts/wait_for_fork
./iac/mainnet-fork/scripts/wait_for_fork
- run:
name: "Release canary to NPM: bb.js"
command: |
Expand Down Expand Up @@ -1024,17 +796,6 @@ workflows:
- barretenberg-x86_64-linux-clang-fuzzing: *defaults
- barretenberg-wasm-linux-clang: *defaults
- barretenberg-x86_64-linux-clang-sol: *defaults
- barretenberg-bench:
requires:
- barretenberg-x86_64-linux-clang
<<: *defaults
- barretenberg-proof-system-tests: *bb_test
- barretenberg-dsl-tests: *bb_test
- barretenberg-tests: *bb_test
- barretenberg-avm-tests: *bb_test
- barretenberg-stdlib-tests: *bb_test
- barretenberg-stdlib-plonk-recursion-ultra-tests: *bb_test
- barretenberg-stdlib-honk-recursion-ultra-tests: *bb_test
- barretenberg-acir-tests-bb: *bb_acir_tests
- barretenberg-acir-tests-bb-sol:
requires:
Expand Down Expand Up @@ -1113,19 +874,6 @@ workflows:
- aztec-package
- cli
<<: *defaults
- e2e-tests: *e2e_test
- cli-docs-sandbox: *e2e_test
- e2e-docs-examples: *e2e_test
- e2e-browser: *e2e_test
- e2e-persistence: *e2e_test
- e2e-sandbox-example: *e2e_test
- integration-l1-publisher: *e2e_test
- pxe: *e2e_test
- uniswap-trade-on-l1-from-l2: *e2e_test
- guides-writing-an-account-contract: *e2e_test
- guides-dapp-testing: *e2e_test
- guides-sample-dapp: *e2e_test
- guides-up-quick-start: *e2e_test

# Everything that must complete before deployment.
- end:
Expand All @@ -1136,37 +884,17 @@ workflows:
- barretenberg-x86_64-linux-clang-fuzzing
- barretenberg-wasm-linux-clang
- barretenberg-x86_64-linux-clang-sol
- barretenberg-bench
- barretenberg-proof-system-tests
- barretenberg-dsl-tests
- barretenberg-tests
- barretenberg-avm-tests
- barretenberg-stdlib-tests
- barretenberg-stdlib-plonk-recursion-ultra-tests
- barretenberg-stdlib-honk-recursion-ultra-tests
- barretenberg-acir-tests-bb
- barretenberg-acir-tests-bb-sol
- barretenberg-docs
- build-docs
- mainnet-fork
- e2e-tests
- cli-docs-sandbox
- e2e-docs-examples
- e2e-browser
- e2e-persistence
- e2e-sandbox-example
- integration-l1-publisher
- pxe
- uniswap-trade-on-l1-from-l2
- guides-writing-an-account-contract
- guides-dapp-testing
- guides-sample-dapp
- guides-up-quick-start
- boxes-vanilla
- boxes-react
- noir-packages-tests
- yarn-project-test
- prover-client-test
- e2e-join
<<: *defaults

# Benchmark jobs.
Expand Down
2 changes: 1 addition & 1 deletion .github/ci-setup-action/action.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,5 @@ runs:
echo "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" > "/run/${{ inputs.concurrency_key }}.lock"
echo "/run/${{ inputs.concurrency_key }}.lock acquired."
post: |
rm "/run/${{ inputs.concurrency_key }}.lock"
rm "/run/${{ inputs.concurrency_key }}.lock" || true
echo "/run/${{ inputs.concurrency_key }}.lock removed."
Loading

0 comments on commit 783feeb

Please sign in to comment.