Skip to content

Commit

Permalink
Merge branch 'master' into sync-noir
Browse files Browse the repository at this point in the history
* master: (237 commits)
  fix: ALU pil relation TWO_LINE_OP_NO_OVERLAP (#6968)
  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
  feat: avm e2e nested call + alu fix + cast fix (#6974)
  feat: affine_element read/write with proper handling of point at infinity (#6963)
  test(avm): Add TS bb prover tests for hashing opcodes (#6970)
  feat(avm): e2e proving of storage (#6967)
  feat(avm): indirect support for kernel output opcodes (#6962)
  chore(avm): enable tag checking and some proving tests (#6966)
  feat: Support disabling aztec vm in non-wasm builds  (#6965)
  docs: aztec macros (#6935)
  chore: granular public simulation benchmarks (#6924)
  hotfix: revert lower earthly parallelism
  feat: contract storage reads serialize with side effect counter (#6961)
  feat(avm): get contract instance now works e2e with avm proving (#6911)
  fix: Fixing 0 naf (#6950)
  git subrepo push --branch=master noir-projects/aztec-nr
  git_subrepo.sh: Fix parent in .gitrepo file. [skip ci]
  ...
  • Loading branch information
TomAFrench committed Jun 10, 2024
2 parents 667085b + 4ba553b commit bdddac9
Show file tree
Hide file tree
Showing 1,100 changed files with 36,702 additions and 63,849 deletions.
30 changes: 27 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,18 @@ jobs:
command: cond_spot_run_build avm-transpiler 32
aztec_manifest_key: avm-transpiler

aztec-nargo:
docker:
- image: aztecprotocol/alpine-build-image
resource_class: small
steps:
- *checkout
- *setup_env
- run:
name: "Build"
command: cond_spot_run_build aztec-nargo 32
aztec_manifest_key: aztec-nargo

l1-contracts:
machine:
image: default
Expand Down Expand Up @@ -381,7 +393,7 @@ jobs:
name: "Release to dockerhub"
command: |
should_release || exit 0
deploy_dockerhub noir
deploy_dockerhub aztec-nargo
deploy_dockerhub aztec
deploy_dockerhub aztec-builder
- run:
Expand Down Expand Up @@ -473,8 +485,11 @@ workflows:
# # This is rewritten to 'system' on the real workflow (otherwise this is ignored by circleci)
# equal: [NEVER, << pipeline.parameters.workflow >>]
when:
and:
# Run if branch is master or branch name contains 'circle-ci'
or:
- equal: [ master, << pipeline.git.branch >> ]
- matches: { pattern: ".*circle-ci.*", value: << pipeline.git.branch >> }
- matches: { pattern: ".+", value: << pipeline.git.tag >> }
jobs:
# Noir
- noir-x86_64: *defaults
Expand All @@ -490,7 +505,16 @@ workflows:
<<: *defaults

# Transpiler
- avm-transpiler: *defaults
- avm-transpiler:
requires:
- noir-ecr-manifest
<<: *defaults

# aztec-nargo (nargo & transpiler)
- aztec-nargo:
requires:
- avm-transpiler
<<: *defaults

# Barretenberg
- barretenberg-x86_64-linux-clang: *defaults
Expand Down
9 changes: 0 additions & 9 deletions .github/paths-filter/.editorconfig

This file was deleted.

3 changes: 0 additions & 3 deletions .github/paths-filter/.eslintignore

This file was deleted.

53 changes: 0 additions & 53 deletions .github/paths-filter/.eslintrc.json

This file was deleted.

1 change: 0 additions & 1 deletion .github/paths-filter/.gitattributes

This file was deleted.

4 changes: 0 additions & 4 deletions .github/paths-filter/.github/filters.yml

This file was deleted.

32 changes: 0 additions & 32 deletions .github/paths-filter/.github/workflows/build.yml

This file was deleted.

145 changes: 0 additions & 145 deletions .github/paths-filter/.github/workflows/pull-request-verification.yml

This file was deleted.

Loading

0 comments on commit bdddac9

Please sign in to comment.