Skip to content

Commit

Permalink
Merge branch 'master' into my domain
Browse files Browse the repository at this point in the history
  • Loading branch information
Rumata888 committed Sep 30, 2024
2 parents 5a37344 + b6551a9 commit f7f7449
Show file tree
Hide file tree
Showing 597 changed files with 13,223 additions and 9,510 deletions.
5 changes: 1 addition & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,4 @@ workflows:
- barretenberg-docs
- e2e-join
- cli-wallet
<<: *defaults

# Production releases.
- deploy-and-release: *defaults_deploy
<<: *defaults
2 changes: 1 addition & 1 deletion .github/earthly-ci-config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
global:
cache_size_pct: 50
buildkit_max_parallelism: 5
buildkit_max_parallelism: 10
container_frontend: docker-shell
buildkit_additional_args: ["-e", "BUILDKIT_STEP_LOG_MAX_SIZE=-1"]
80 changes: 61 additions & 19 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,8 @@ jobs:
build:
needs: [build-images, changes]
if: (needs.changes.outputs.non-docs == 'true' && needs.changes.outputs.non-misc-ci == 'true' && needs.changes.outputs.non-barretenberg-cpp == 'true') || github.ref_name == 'master'
# NOTE: we don't skip this job here instead using if's below so that dependencies are not broken
# we still want build to be at the bottom of the dependency chain
runs-on: ${{ github.event.pull_request.user.login || github.actor }}-x86
outputs:
e2e_list: ${{ steps.e2e_list.outputs.list }}
Expand All @@ -132,6 +133,7 @@ jobs:
# prepare images locally, tagged by commit hash
- name: "Build E2E Image"
timeout-minutes: 40
if: (needs.changes.outputs.non-docs == 'true' && needs.changes.outputs.non-misc-ci == 'true' && needs.changes.outputs.non-barretenberg-cpp == 'true') || github.ref_name == 'master'
run: |
earthly-ci ./yarn-project+export-e2e-test-images
# We base our e2e list used in e2e-x86 off the targets in ./yarn-project/end-to-end
Expand Down Expand Up @@ -160,7 +162,7 @@ jobs:
# all the non-bench end-to-end integration tests for aztec
e2e:
needs: [build, changes]
if: needs.changes.outputs.non-barretenberg-cpp == 'true' || github.ref_name == 'master' || contains(github.event.pull_request.labels.*.name, 'e2e')
if: (needs.changes.outputs.non-docs == 'true' && needs.changes.outputs.non-misc-ci == 'true' && needs.changes.outputs.non-barretenberg-cpp == 'true') || github.ref_name == 'master' || contains(github.event.pull_request.labels.*.name, 'e2e')
runs-on: ubuntu-20.04
strategy:
fail-fast: false
Expand Down Expand Up @@ -190,7 +192,7 @@ jobs:
# all the benchmarking end-to-end integration tests for aztec (not required to merge)
bench-e2e:
needs: [build, changes]
if: needs.changes.outputs.non-barretenberg-cpp == 'true' || github.ref_name == 'master' || contains(github.event.pull_request.labels.*.name, 'bench')
if: (needs.changes.outputs.non-docs == 'true' && needs.changes.outputs.non-misc-ci == 'true' && needs.changes.outputs.non-barretenberg-cpp == 'true') || github.ref_name == 'master' || contains(github.event.pull_request.labels.*.name, 'bench')
runs-on: ubuntu-20.04
strategy:
fail-fast: false
Expand Down Expand Up @@ -221,7 +223,7 @@ jobs:
acir-bench:
runs-on: ubuntu-20.04
needs: [build-images, changes]
needs: [build, changes]
# Note: not fully accurate, but to work with bench-summary needs to be the same as bench-e2e
if: needs.changes.outputs.non-barretenberg-cpp == 'true'
steps:
Expand Down Expand Up @@ -258,7 +260,6 @@ jobs:
ref: "${{ github.event.pull_request.head.sha }}"
- uses: ./.github/ci-setup-action
with:
dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}"
concurrency_key: build-x86
- name: "Build and upload bench aggregate file"
working-directory: ./yarn-project/scripts
Expand Down Expand Up @@ -286,7 +287,7 @@ jobs:
AZTEC_BOT_GITHUB_TOKEN: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}

bb-gcc:
needs: [build-images, changes]
needs: [build, changes]
runs-on: ${{ github.event.pull_request.user.login || github.actor }}-x86
if: needs.changes.outputs.barretenberg-cpp == 'true'
steps:
Expand All @@ -306,7 +307,7 @@ jobs:
# barretenberg (prover) native, AVM (public VM) and Merkle tree (world state) tests
# only ran on x86 for resource reasons (memory intensive)
bb-native-tests:
needs: [build-images, changes]
needs: [build, changes]
runs-on: ${{ github.event.pull_request.user.login || github.actor }}-x86
if: needs.changes.outputs.barretenberg-cpp == 'true'
steps:
Expand All @@ -324,7 +325,7 @@ jobs:
run: earthly-ci --exec-stats --no-output +test --hardware_concurrency=64

bb-js-test:
needs: [build-images, changes]
needs: [build, changes]
runs-on: ${{ github.event.pull_request.user.login || github.actor }}-x86
if: needs.changes.outputs.barretenberg == 'true'
steps:
Expand All @@ -339,7 +340,7 @@ jobs:
run: earthly-ci --no-output ./+test

noir-build-acir-tests:
needs: [build-images, changes]
needs: [build, changes]
runs-on: ${{ github.event.pull_request.user.login || github.actor }}-x86
if: needs.changes.outputs.barretenberg == 'true' || needs.changes.outputs.noir == 'true'
steps:
Expand Down Expand Up @@ -413,7 +414,7 @@ jobs:
run: earthly-ci --no-output ./+barretenberg-acir-tests-bb.js

noir-format:
needs: [build-images, changes]
needs: [build, changes]
runs-on: ${{ github.event.pull_request.user.login || github.actor }}-x86
if: needs.changes.outputs.noir == 'true' || needs.changes.outputs.noir-projects == 'true'
steps:
Expand All @@ -433,7 +434,7 @@ jobs:
earthly-ci --no-output ./+format
noir-test:
needs: [build-images, changes]
needs: [build, changes]
runs-on: ${{ github.event.pull_request.user.login || github.actor }}-x86
if: needs.changes.outputs.noir == 'true'
steps:
Expand All @@ -446,7 +447,7 @@ jobs:
run: earthly-ci --no-output ./noir+test

noir-examples:
needs: [build-images, changes]
needs: [build, changes]
runs-on: ${{ github.event.pull_request.user.login || github.actor }}-x86
if: needs.changes.outputs.barretenberg == 'true' || needs.changes.outputs.noir == 'true'
steps:
Expand All @@ -459,7 +460,7 @@ jobs:
run: earthly-ci --no-output ./noir+examples

noir-packages-test:
needs: [build-images, changes]
needs: [build, changes]
runs-on: ${{ github.event.pull_request.user.login || github.actor }}-x86
if: needs.changes.outputs.barretenberg == 'true' || needs.changes.outputs.noir == 'true'
steps:
Expand All @@ -473,7 +474,7 @@ jobs:
run: earthly-ci --no-output ./noir+packages-test

noir-projects:
needs: [build-images, changes, build]
needs: [build, changes, build]
runs-on: ${{ github.event.pull_request.user.login || github.actor }}-x86
if: needs.changes.outputs.barretenberg == 'true' || needs.changes.outputs.noir == 'true' || needs.changes.outputs.noir-projects == 'true' || needs.changes.outputs.txe == 'true'
steps:
Expand All @@ -488,7 +489,7 @@ jobs:
earthly-ci --no-output ./noir-projects/+test
avm-format:
needs: [build-images, changes]
needs: [build, changes]
runs-on: ${{ github.event.pull_request.user.login || github.actor }}-x86
if: needs.changes.outputs.avm-transpiler == 'true' || needs.changes.outputs.noir == 'true'
steps:
Expand Down Expand Up @@ -542,7 +543,7 @@ jobs:
run: earthly-ci --no-output ./yarn-project/+prover-client-test

l1-contracts-test:
needs: [build-images, changes]
needs: [build, changes]
runs-on: ${{ github.event.pull_request.user.login || github.actor }}-x86
if: needs.changes.outputs.l1-contracts == 'true'
steps:
Expand All @@ -555,7 +556,7 @@ jobs:
run: earthly-ci --no-output ./l1-contracts+test

docs-preview:
needs: [build-images, changes]
needs: [build, changes]
runs-on: ${{ github.event.pull_request.user.login || github.actor }}-x86
if: needs.changes.outputs.non-barretenberg-cpp == 'true'
steps:
Expand All @@ -576,7 +577,7 @@ jobs:
bb-bench:
runs-on: ubuntu-20.04
needs: [build-images, changes]
needs: [build, changes]
if: needs.changes.outputs.barretenberg-cpp == 'true'
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -661,7 +662,7 @@ jobs:
run: earthly-ci -P --no-output +test --box=${{ matrix.box }} --browser=${{ matrix.browser }} --mode=cache

protocol-circuits-gates-report:
needs: [build-images, changes]
needs: [build, changes]
if: needs.changes.outputs.non-docs == 'true' && needs.changes.outputs.non-misc-ci == 'true'
runs-on: ${{ github.event.pull_request.user.login || github.actor }}-x86
permissions:
Expand Down Expand Up @@ -696,6 +697,47 @@ jobs:
delete: ${{ !steps.gates_diff.outputs.markdown }}
message: ${{ steps.gates_diff.outputs.markdown }}

public-functions-size-report:
needs: [build, changes]
if: needs.changes.outputs.non-docs == 'true' && needs.changes.outputs.non-misc-ci == 'true'
runs-on: ${{ github.event.pull_request.user.login || github.actor }}-x86
permissions:
pull-requests: write
steps:
- uses: actions/checkout@v4
with: { ref: "${{ env.GIT_COMMIT }}" }
# Only allow one memory-hunger prover test to use this runner
- uses: ./.github/ci-setup-action
with:
concurrency_key: public-functions-size-report-x86
- name: "Aztec Public Functions Bytecode Size Report"
working-directory: ./noir-projects/
timeout-minutes: 40
run: |
earthly-ci \
--artifact +public-functions-report/public_functions_report.json
mv public_functions_report.json ../public_functions_report.json
- name: Compare public functions bytecode size reports
id: public_functions_sizes_diff
uses: noir-lang/noir-gates-diff@d88f7523b013b9edd3f31c5cfddaef87a3fe1b48
with:
report: public_functions_report.json
header: |
# Changes to public function bytecode sizes
brillig_report: true
brillig_report_bytes: true
summaryQuantile: 0 # Display any diff in bytecode size count

- name: Add bytecode size diff to sticky comment
if: github.event_name == 'pull_request' || github.event_name == 'pull_request_target'
uses: marocchino/sticky-pull-request-comment@v2
with:
header: public_functions_size
# delete the comment in case changes no longer impact circuit sizes
delete: ${{ !steps.public_functions_sizes_diff.outputs.markdown }}
message: ${{ steps.public_functions_sizes_diff.outputs.markdown }}

merge-check:
runs-on: ubuntu-20.04
needs:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Run spartan network tests
name: KIND network tests
on:
workflow_dispatch:
schedule:
Expand Down
Loading

0 comments on commit f7f7449

Please sign in to comment.