From 9b859e608046145d7ee76b457cc2244c9b7028c0 Mon Sep 17 00:00:00 2001 From: ludamad Date: Mon, 17 Apr 2023 15:17:52 -0400 Subject: [PATCH] chore: post merge fixup --- .circleci/config.yml | 109 ++++++++++- build_manifest.json | 215 ++++++---------------- circuits/.circleci/config.yml | 199 -------------------- circuits/.github/pull_request_template.md | 33 ---- circuits/.gitmodules | 7 - circuits/build_manifest.json | 26 --- circuits/build_manifest.sh | 14 -- 7 files changed, 154 insertions(+), 449 deletions(-) delete mode 100644 circuits/.circleci/config.yml delete mode 100644 circuits/.github/pull_request_template.md delete mode 100644 circuits/.gitmodules delete mode 100644 circuits/build_manifest.json delete mode 100644 circuits/build_manifest.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index d8895d792d16..939d77a93c46 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -52,7 +52,7 @@ checkout: &checkout git fetch --depth 50 --filter=blob:none origin $CIRCLE_SHA1 git checkout FETCH_HEAD # Initialize submodules recursively - git submodule update --init --recursive circuits build-system + git submodule update --init --recursive # Called setup_env to setup a bunch of global variables used throughout the rest of the build process. # It takes the required CCI environment variables as inputs, and gives them normalised names for the rest of @@ -62,8 +62,26 @@ setup_env: &setup_env name: "Setup environment" command: ./build-system/scripts/setup_env "$CIRCLE_SHA1" "$CIRCLE_TAG" "$CIRCLE_JOB" "$CIRCLE_REPOSITORY_URL" "$CIRCLE_BRANCH" +# This step is used to save logs from various barretenberg test to the workspace so that they can be used later to parse benchmark values out of them +save_logs: &save_logs + persist_to_workspace: + root: /tmp/test-logs + paths: + - ./* + jobs: - wasm-linux-clang: + circuits-wasm-linux-clang: + docker: + - image: aztecprotocol/alpine-build-image + resource_class: small + steps: + - *checkout + - *setup_env + - run: + name: "Build" + command: cond_spot_run_build circuits-wasm-linux-clang 64 + + circuits-wasm-linux-clang-assert: docker: - image: aztecprotocol/alpine-build-image resource_class: small @@ -72,7 +90,65 @@ jobs: - *setup_env - run: name: "Build" - command: cond_spot_run_build aztec3-circuits-wasm-linux-clang 64 + command: cond_spot_run_build circuits-wasm-linux-clang-assert 64 + + circuits-x86_64-linux-clang: + docker: + - image: aztecprotocol/alpine-build-image + resource_class: small + steps: + - *checkout + - *setup_env + - run: + name: "Build" + command: cond_spot_run_build circuits-x86_64-linux-clang 64 + + circuits-x86_64-linux-clang-assert: + docker: + - image: aztecprotocol/alpine-build-image + resource_class: small + steps: + - *checkout + - *setup_env + - run: + name: "Build" + command: cond_spot_run_build circuits-x86_64-linux-clang-assert 64 + + circuits-wasm-tests: + docker: + - image: aztecprotocol/alpine-build-image + resource_class: small + steps: + - *checkout + - *setup_env + - run: + name: "Test" + command: cond_spot_run_tests circuits-wasm-linux-clang-assert 1 a3-tests USE_WASM_TIME + - *save_logs + + circuits-tests: + docker: + - image: aztecprotocol/alpine-build-image + resource_class: small + steps: + - *checkout + - *setup_env + - run: + name: "Test" + command: cond_spot_run_tests circuits-x86_64-linux-clang-assert 1 a3-tests + - *save_logs + + #circuits--tests: + # docker: + # - image: aztecprotocol/alpine-build-image + # resource_class: small + # steps: + # - *checkout + # - *setup_env + # - run: + # name: 'Test' + # command: cond_spot_run_tests circuits-x86_64-linux-clang-assert 1 _tests + # - *save_logs yarn-project-base: machine: @@ -113,7 +189,7 @@ jobs: name: "Build and test" command: build foundation - aztec-js: + aztec-js: machine: image: ubuntu-2004:202010-01 resource_class: large @@ -211,7 +287,7 @@ jobs: - run: name: "Build and test" command: build archiver - + aztec-rpc: machine: image: ubuntu-2004:202010-01 @@ -319,17 +395,31 @@ e2e_test: &e2e_test requires: - e2e-join <<: *defaults - +circuits-wasm-test: &circuits-wasm-test + requires: + - circuits-wasm-linux-clang-assert + <<: *defaults +circuits-test: &circuits-test + requires: + - circuits-x86_64-linux-clang-assert + <<: *defaults workflows: system: when: equal: [system, << pipeline.parameters.workflow >>] jobs: - - wasm-linux-clang: - <<: *defaults + - circuits-wasm-linux-clang: *defaults + - circuits-wasm-linux-clang-assert: *defaults + - circuits-x86_64-linux-clang: *defaults + - circuits-x86_64-linux-clang-assert: *defaults + - circuits-wasm-tests: + <<: *circuits-wasm-test + - circuits-tests: + <<: *circuits-test + #- aztec3-circuit--tests: *circuits-test - yarn-project-base: requires: - - wasm-linux-clang + - circuits-wasm-linux-clang <<: *defaults - ethereum-js: *yarn_project @@ -356,7 +446,6 @@ workflows: - noir-contracts - foundation <<: *defaults - - e2e-deploy-contract: *e2e_test - e2e-zk-token-contract: *e2e_test - e2e-block-building: *e2e_test diff --git a/build_manifest.json b/build_manifest.json index 1cb9712426a7..07fc52ca7efa 100644 --- a/build_manifest.json +++ b/build_manifest.json @@ -1,46 +1,39 @@ { - "aztec3-circuits-wasm-linux-clang": { + "circuits-wasm-linux-clang": { "buildDir": "circuits/cpp", "dockerfile": "dockerfiles/Dockerfile.wasm-linux-clang", - "rebuildPatterns": [ - "^circuits/" - ], + "rebuildPatterns": ["^circuits/"], + "dependencies": [] + }, + "circuits-wasm-linux-clang-assert": { + "buildDir": "circuits/cpp", + "dockerfile": "dockerfiles/Dockerfile.wasm-linux-clang-assert", + "rebuildPatterns": ["^circuits/"], "dependencies": [] }, "circuits-x86_64-linux-clang": { - "buildDir": "circuits", + "buildDir": "circuits/cpp", "dockerfile": "dockerfiles/Dockerfile.x86_64-linux-clang", - "rebuildPatterns": [ - "^circuits/" - ], + "rebuildPatterns": ["^circuits/"], "dependencies": [] }, "circuits-x86_64-linux-clang-assert": { - "buildDir": "circuits", + "buildDir": "circuits/cpp", "dockerfile": "dockerfiles/Dockerfile.x86_64-linux-clang-assert", - "rebuildPatterns": [ - "^circuits/" - ], + "rebuildPatterns": ["^circuits/"], "dependencies": [] }, "circuits-x86_64-linux-gcc": { - "buildDir": "circuits", + "buildDir": "circuits/cpp", "dockerfile": "dockerfiles/Dockerfile.x86_64-linux-gcc", - "rebuildPatterns": [ - "^circuits/" - ], + "rebuildPatterns": ["^circuits/"], "dependencies": [] }, "l1-contracts": { "buildDir": "l1-contracts", "dockerfile": "Dockerfile", - "rebuildPatterns": [ - "^l1-contracts/" - ], - "dependencies": [ - "ethereum.js", - "foundation" - ] + "rebuildPatterns": ["^l1-contracts/"], + "dependencies": ["ethereum.js", "foundation"] }, "yarn-project-base": { "buildDir": "yarn-project", @@ -49,17 +42,13 @@ "^yarn-project/yarn-project-base/", "^yarn-project/yarn.lock" ], - "dependencies": [ - "aztec3-circuits-wasm-linux-clang" - ] + "dependencies": ["circuits-wasm-linux-clang"] }, "acir-simulator": { "buildDir": "yarn-project", "projectDir": "yarn-project/acir-simulator", "dockerfile": "acir-simulator/Dockerfile", - "rebuildPatterns": [ - "^yarn-project/acir-simulator/" - ], + "rebuildPatterns": ["^yarn-project/acir-simulator/"], "dependencies": [ "barretenberg.js", "circuits.js", @@ -72,34 +61,21 @@ "buildDir": "yarn-project", "projectDir": "yarn-project/archiver", "dockerfile": "archiver/Dockerfile", - "rebuildPatterns": [ - "^yarn-project/archiver/" - ], - "dependencies": [ - "ethereum.js", - "foundation", - "l1-contracts", - "types" - ] + "rebuildPatterns": ["^yarn-project/archiver/"], + "dependencies": ["ethereum.js", "foundation", "l1-contracts", "types"] }, "aztec-cli": { "buildDir": "yarn-project", "projectDir": "yarn-project/aztec-cli", "dockerfile": "aztec-cli/Dockerfile", - "rebuildPatterns": [ - "^yarn-project/aztec-cli/" - ], - "dependencies": [ - "foundation" - ] + "rebuildPatterns": ["^yarn-project/aztec-cli/"], + "dependencies": ["foundation"] }, "aztec-rpc": { "buildDir": "yarn-project", "projectDir": "yarn-project/aztec-rpc", "dockerfile": "aztec-rpc/Dockerfile", - "rebuildPatterns": [ - "^yarn-project/aztec-rpc/" - ], + "rebuildPatterns": ["^yarn-project/aztec-rpc/"], "dependencies": [ "acir-simulator", "aztec-node", @@ -115,48 +91,28 @@ "buildDir": "yarn-project", "projectDir": "yarn-project/aztec.js", "dockerfile": "aztec.js/Dockerfile", - "rebuildPatterns": [ - "^yarn-project/aztec.js/" - ], - "dependencies": [ - "aztec-rpc", - "circuits.js", - "foundation", - "noir-contracts" - ] + "rebuildPatterns": ["^yarn-project/aztec.js/"], + "dependencies": ["aztec-rpc", "circuits.js", "foundation", "noir-contracts"] }, "barretenberg.js": { "buildDir": "yarn-project", "projectDir": "yarn-project/barretenberg.js", "dockerfile": "barretenberg.js/Dockerfile", - "rebuildPatterns": [ - "^yarn-project/barretenberg.js/" - ], - "dependencies": [ - "foundation", - "yarn-project-base" - ] + "rebuildPatterns": ["^yarn-project/barretenberg.js/"], + "dependencies": ["foundation", "yarn-project-base"] }, "circuits.js": { "buildDir": "yarn-project", "projectDir": "yarn-project/circuits.js", "dockerfile": "circuits.js/Dockerfile", - "rebuildPatterns": [ - "^yarn-project/circuits.js/" - ], - "dependencies": [ - "barretenberg.js", - "foundation", - "yarn-project-base" - ] + "rebuildPatterns": ["^yarn-project/circuits.js/"], + "dependencies": ["barretenberg.js", "foundation", "yarn-project-base"] }, "end-to-end": { "buildDir": "yarn-project", "projectDir": "yarn-project/end-to-end", "dockerfile": "end-to-end/Dockerfile", - "rebuildPatterns": [ - "^yarn-project/end-to-end/" - ], + "rebuildPatterns": ["^yarn-project/end-to-end/"], "dependencies": [ "aztec-node", "aztec.js", @@ -170,114 +126,70 @@ "buildDir": "yarn-project", "projectDir": "yarn-project/ethereum.js", "dockerfile": "ethereum.js/Dockerfile", - "rebuildPatterns": [ - "^yarn-project/ethereum.js/" - ], - "dependencies": [ - "foundation" - ] + "rebuildPatterns": ["^yarn-project/ethereum.js/"], + "dependencies": ["foundation"] }, "foundation": { "buildDir": "yarn-project", "projectDir": "yarn-project/foundation", "dockerfile": "foundation/Dockerfile", - "rebuildPatterns": [ - "^yarn-project/foundation/" - ], + "rebuildPatterns": ["^yarn-project/foundation/"], "dependencies": [] }, "kernel-prover": { "buildDir": "yarn-project", "projectDir": "yarn-project/kernel-prover", "dockerfile": "kernel-prover/Dockerfile", - "rebuildPatterns": [ - "^yarn-project/kernel-prover/" - ], - "dependencies": [ - "acir-simulator", - "circuits.js", - "foundation" - ] + "rebuildPatterns": ["^yarn-project/kernel-prover/"], + "dependencies": ["acir-simulator", "circuits.js", "foundation"] }, "key-store": { "buildDir": "yarn-project", "projectDir": "yarn-project/key-store", "dockerfile": "key-store/Dockerfile", - "rebuildPatterns": [ - "^yarn-project/key-store/" - ], - "dependencies": [ - "foundation" - ] + "rebuildPatterns": ["^yarn-project/key-store/"], + "dependencies": ["foundation"] }, "l2-block": { "buildDir": "yarn-project", "projectDir": "yarn-project/l2-block", "dockerfile": "l2-block/Dockerfile", - "rebuildPatterns": [ - "^yarn-project/l2-block/" - ], - "dependencies": [ - "circuits.js", - "foundation", - "l1-contracts", - "tx" - ] + "rebuildPatterns": ["^yarn-project/l2-block/"], + "dependencies": ["circuits.js", "foundation", "l1-contracts", "tx"] }, "merkle-tree": { "buildDir": "yarn-project", "projectDir": "yarn-project/merkle-tree", "dockerfile": "merkle-tree/Dockerfile", - "rebuildPatterns": [ - "^yarn-project/merkle-tree/" - ], - "dependencies": [ - "barretenberg.js", - "foundation" - ] + "rebuildPatterns": ["^yarn-project/merkle-tree/"], + "dependencies": ["barretenberg.js", "foundation"] }, "noir-contracts": { "buildDir": "yarn-project", "projectDir": "yarn-project/noir-contracts", "dockerfile": "noir-contracts/Dockerfile", - "rebuildPatterns": [ - "^yarn-project/noir-contracts/" - ], - "dependencies": [ - "foundation" - ] + "rebuildPatterns": ["^yarn-project/noir-contracts/"], + "dependencies": ["foundation"] }, "p2p": { "buildDir": "yarn-project", "projectDir": "yarn-project/p2p", "dockerfile": "p2p/Dockerfile", - "rebuildPatterns": [ - "^yarn-project/p2p/" - ], - "dependencies": [ - "circuits.js", - "foundation", - "types" - ] + "rebuildPatterns": ["^yarn-project/p2p/"], + "dependencies": ["circuits.js", "foundation", "types"] }, "prover-client": { "buildDir": "yarn-project", "projectDir": "yarn-project/prover-client", "dockerfile": "prover-client/Dockerfile", - "rebuildPatterns": [ - "^yarn-project/prover-client/" - ], - "dependencies": [ - "foundation" - ] + "rebuildPatterns": ["^yarn-project/prover-client/"], + "dependencies": ["foundation"] }, "aztec-node": { "buildDir": "yarn-project", "projectDir": "yarn-project/aztec-node", "dockerfile": "aztec-node/Dockerfile", - "rebuildPatterns": [ - "^yarn-project/aztec-node/" - ], + "rebuildPatterns": ["^yarn-project/aztec-node/"], "dependencies": [ "archiver", "barretenberg.js", @@ -295,9 +207,7 @@ "buildDir": "yarn-project", "projectDir": "yarn-project/sequencer-client", "dockerfile": "sequencer-client/Dockerfile", - "rebuildPatterns": [ - "^yarn-project/sequencer-client/" - ], + "rebuildPatterns": ["^yarn-project/sequencer-client/"], "dependencies": [ "circuits.js", "ethereum.js", @@ -313,36 +223,21 @@ "buildDir": "yarn-project", "projectDir": "yarn-project/tx", "dockerfile": "tx/Dockerfile", - "rebuildPatterns": [ - "^yarn-project/tx/" - ], - "dependencies": [ - "barretenberg.js", - "circuits.js", - "foundation", - "types" - ] + "rebuildPatterns": ["^yarn-project/tx/"], + "dependencies": ["barretenberg.js", "circuits.js", "foundation", "types"] }, "types": { "buildDir": "yarn-project", "projectDir": "yarn-project/types", "dockerfile": "types/Dockerfile", - "rebuildPatterns": [ - "^yarn-project/types/" - ], - "dependencies": [ - "circuits.js", - "foundation", - "l1-contracts" - ] + "rebuildPatterns": ["^yarn-project/types/"], + "dependencies": ["circuits.js", "foundation", "l1-contracts"] }, "world-state": { "buildDir": "yarn-project", "projectDir": "yarn-project/world-state", "dockerfile": "world-state/Dockerfile", - "rebuildPatterns": [ - "^yarn-project/world-state/" - ], + "rebuildPatterns": ["^yarn-project/world-state/"], "dependencies": [ "barretenberg.js", "circuits.js", @@ -351,4 +246,4 @@ "types" ] } -} \ No newline at end of file +} diff --git a/circuits/.circleci/config.yml b/circuits/.circleci/config.yml deleted file mode 100644 index 28e83ba795c5..000000000000 --- a/circuits/.circleci/config.yml +++ /dev/null @@ -1,199 +0,0 @@ -# This config consists of currently 1 workflow. -# - system: The main Aztec 3 circuits and C++ -# -# The default workflow is system. To trigger the other workflows, trigger a workflow from CCI -# setting a string variable called `workflow` to another name. -# -# This file uses YAML anchors and aliases to prevent repetition of blocks of config: -# https://support.atlassian.com/bitbucket-cloud/docs/yaml-anchors/ -# -# Two primary anchors are checkout and setup_env, called as the first step of almost all jobs: -# - checkout: A custom checkout step to reduce the amount of data downloaded to improve speed. -# - setup_env: Sets up the common environment used by all build steps. -# -# Two CCI executors are used: -# - docker (small): Used only to launch external EC2 instances for big workloads. It's the cheapest option. -# - machine (large): Used for building in CCI itself. 4cpus, 15GB has the optimal power/cost ratio. -# -# The docker executor uses a custom image build in `build_image`. It's specifically streamlined for fast download -# with just enough tools to execute the build system, and launch EC2 instances etc. -# -# There are some `join` steps that are just noops. They are just used to produce cleaner graph rendering in CCI. - -version: 2.1 - -# This build step checks out the code from the repository. It has a hardcoded readonly key to allow the checkout. -# Initially it just fetches the repo metadata for the current commit hash to a depth of 50 commits. -# We need historical commit hashes to calculate diffs between previous and current commits. -# It then checks out the fetched head to actually download the data. -checkout: &checkout - run: - name: 'Checkout code' - command: | - cd $HOME - mkdir -p .ssh - chmod 0700 .ssh - ssh-keyscan -t rsa github.com >> .ssh/known_hosts - - # IF YOU'RE CHANGING THIS, YOU ALSO WANT TO CHANGE: build-system/remote_build/remote_build - # Shallow checkout this commit. - mkdir -p project - cd project - git init - git remote add origin $CIRCLE_REPOSITORY_URL - # Only download metadata when fetching. - git fetch --depth 50 --filter=blob:none origin $CIRCLE_SHA1 - git checkout FETCH_HEAD - # Pull in build-system submodule. - git submodule update --init build-system - -# This build step checks out the code from the benchmark-archive repository. -# The key is saved in CircleCi environment in base64 format. -# Initially it just fetches the latest version. -benchmark_add_keys: &benchmark_add_keys - run: - name: 'Add keys for getting the benchmark archive' - command: | - cd $HOME - mkdir -p .ssh - chmod 0700 .ssh - ssh-keyscan -t rsa github.com >> .ssh/known_hosts - - # A read-write key for updating the repository. - echo "$GITHUB_BENCMARK_REPOSITORY_SSH_KEY" | base64 -d > .ssh/id_ed25519 - - # This allows github to discern wich key to use. - echo "Host github.com - Hostname github.com - IdentityFile=/root/.ssh/id_rsa - - Host github.com-logs - Hostname github.com - IdentityFile=/root/.ssh/id_ed25519" > .ssh/config - - chmod 0600 .ssh/id_ed25519 - ssh-add .ssh/id_ed25519 - -# Called setup_env to setup a bunch of global variables used throughout the rest of the build process. -# It takes the required CCI environment variables as inputs, and gives them normalised names for the rest of -# the build process. This enables easy running of the build system external to CCI, as used for powerful EC2 builds. -setup_env: &setup_env - run: - name: 'Setup environment' - command: ./build-system/scripts/setup_env "$CIRCLE_SHA1" "$CIRCLE_TAG" "$CIRCLE_JOB" "$CIRCLE_REPOSITORY_URL" "$CIRCLE_BRANCH" - -# This step is used to save logs from various barretenberg test to the workspace so that they can be used later to parse benchmark values out of them -save_logs: &save_logs - persist_to_workspace: - root: /tmp/test-logs - paths: - - ./* - -jobs: - wasm-linux-clang: - docker: - - image: aztecprotocol/alpine-build-image - resource_class: small - steps: - - *checkout - - *setup_env - - run: - name: 'Build' - command: cond_spot_run_build aztec3-circuits-wasm-linux-clang 64 - - wasm-linux-clang-assert: - docker: - - image: aztecprotocol/alpine-build-image - resource_class: small - steps: - - *checkout - - *setup_env - - run: - name: 'Build' - command: cond_spot_run_build aztec3-circuits-wasm-linux-clang-assert 64 - - x86_64-linux-clang: - docker: - - image: aztecprotocol/alpine-build-image - resource_class: small - steps: - - *checkout - - *setup_env - - run: - name: 'Build' - command: cond_spot_run_build aztec3-circuits-x86_64-linux-clang 64 - - x86_64-linux-clang-assert: - docker: - - image: aztecprotocol/alpine-build-image - resource_class: small - steps: - - *checkout - - *setup_env - - run: - name: 'Build' - command: cond_spot_run_build aztec3-circuits-x86_64-linux-clang-assert 64 - - aztec3-circuits-wasm-tests: - docker: - - image: aztecprotocol/alpine-build-image - resource_class: small - steps: - - *checkout - - *setup_env - - run: - name: 'Test' - command: cond_spot_run_tests aztec3-circuits-wasm-linux-clang-assert 1 a3-tests USE_WASM_TIME - - *save_logs - - aztec3-circuits-tests: - docker: - - image: aztecprotocol/alpine-build-image - resource_class: small - steps: - - *checkout - - *setup_env - - run: - name: 'Test' - command: cond_spot_run_tests aztec3-circuits-x86_64-linux-clang-assert 1 a3-tests - - *save_logs - - #aztec3-circuits--tests: - # docker: - # - image: aztecprotocol/alpine-build-image - # resource_class: small - # steps: - # - *checkout - # - *setup_env - # - run: - # name: 'Test' - # command: cond_spot_run_tests aztec3-circuits-x86_64-linux-clang-assert 1 _tests - # - *save_logs - -# Repeatable config for defining the workflow below. -tag_regex: &tag_regex /v[0-9]+(\.[0-9]+)*(-[a-zA-Z-]+\.[0-9]+)?/ -defaults: &defaults - context: - - build - filters: - tags: - only: *tag_regex -a3_wasm_test: &a3_wasm_test - requires: - - wasm-linux-clang-assert - <<: *defaults -a3_test: &a3_test - requires: - - x86_64-linux-clang-assert - <<: *defaults - -workflows: - system: - jobs: - - wasm-linux-clang: *defaults - - wasm-linux-clang-assert: *defaults - - x86_64-linux-clang: *defaults - - x86_64-linux-clang-assert: *defaults - - aztec3-circuits-wasm-tests: *a3_wasm_test - - aztec3-circuits-tests: *a3_test - #- aztec3-circuit--tests: *a3_test diff --git a/circuits/.github/pull_request_template.md b/circuits/.github/pull_request_template.md deleted file mode 100644 index b3ed4e76e3e2..000000000000 --- a/circuits/.github/pull_request_template.md +++ /dev/null @@ -1,33 +0,0 @@ -# Description - -Please provide a paragraph or two giving a summary of the change, including relevant motivation and context. - -# Checklist: - -- [ ] I have reviewed my diff in github, line by line. -- [ ] Every change is related to the PR description. -- [ ] I have [linked](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue) this pull request to the issue(s) that it resolves. -- [ ] There are no unexpected formatting changes, superfluous debug logs, or commented-out code. -- [ ] There are no circuit changes, OR specifications in `/specs` have been updated. -- [ ] There are no circuit changes, OR a cryptographer has been assigned for review. -- [ ] I've updated any terraform that needs updating (e.g. environment variables) for deployment. -- [ ] The branch has been rebased against the head of its merge target. -- [ ] I'm happy for the PR to be merged at the reviewer's next convenience. -- [ ] New functions, classes, etc. have been documented according to the doxygen comment format. Classes and structs must have `@brief` describing the intended functionality. -- [ ] If existing code has been modified, such documentation has been added or updated. - -> **Note** -> If you are updating the submodule, please make sure you do it in its own _special_ PR and avoid making changes to the submodule as a part of other PRs. -> To update a submodule, you can run the following commands: -> ```console -> $ git submodule update --recursive -> ``` -> Alternatively, you can select a particular commit in `barretenberg/aztec3` that you wish to point to: -> ```console -> $ cd barretenberg -> $ git pull origin aztec3 # This will point to the latest commit in `barretenberg/aztec3` -> $ git checkout # Use this if you wish to point to a particular commit. -> $ cd .. -> $ git add . && git commit -m -> $ git push -> ``` diff --git a/circuits/.gitmodules b/circuits/.gitmodules deleted file mode 100644 index cfe7b14e1c17..000000000000 --- a/circuits/.gitmodules +++ /dev/null @@ -1,7 +0,0 @@ -[submodule "barretenberg"] - path = cpp/barretenberg - url = git@github.com:AztecProtocol/barretenberg.git - branch = aztec3 -[submodule "aztec-build-system"] - path = build-system - url = git@github.com:AztecProtocol/build-system.git diff --git a/circuits/build_manifest.json b/circuits/build_manifest.json deleted file mode 100644 index 41be4339731f..000000000000 --- a/circuits/build_manifest.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "aztec3-circuits-wasm-linux-clang": { - "buildDir": "cpp", - "dockerfile": "dockerfiles/Dockerfile.wasm-linux-clang", - "rebuildPatterns": ["^cpp/"], - "dependencies": [] - }, - "aztec3-circuits-wasm-linux-clang-assert": { - "buildDir": "cpp", - "dockerfile": "dockerfiles/Dockerfile.wasm-linux-clang-assert", - "rebuildPatterns": ["^cpp/"], - "dependencies": [] - }, - "aztec3-circuits-x86_64-linux-clang": { - "buildDir": "cpp", - "dockerfile": "dockerfiles/Dockerfile.x86_64-linux-clang", - "rebuildPatterns": ["^cpp/"], - "dependencies": [] - }, - "aztec3-circuits-x86_64-linux-clang-assert": { - "buildDir": "cpp", - "dockerfile": "dockerfiles/Dockerfile.x86_64-linux-clang-assert", - "rebuildPatterns": ["^cpp/"], - "dependencies": [] - } - } \ No newline at end of file diff --git a/circuits/build_manifest.sh b/circuits/build_manifest.sh deleted file mode 100644 index 27c20aef9c8a..000000000000 --- a/circuits/build_manifest.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -# Source this file to define the PROJECTS variable. -# PROJECT elements have structure PROJECT:WORKING_DIR:DOCKERFILE:REPO. -# -# TODO: Generate this from build_manifest.json - -# Commenting out a few projects, as the main use case is now to build the images needed to run end-to-end tests. -# If wanting to just see if docker images actually build, you can temporarily uncomment required projects. -PROJECTS=( - aztec3-circuits-wasm:cpp:./dockerfiles/Dockerfile.wasm-linux-clang:aztec3-circuits-wasm-linux-clang - aztec3-circuits-wasm-assert:cpp:./dockerfiles/Dockerfile.wasm-linux-clang-assert:aztec3-circuits-wasm-linux-clang-assert - aztec3-circuits-x86_64-clang:cpp:./dockerfiles/Dockerfile.x86_64-linux-clang:aztec3-circuits-x86_64-linux-clang - aztec3-circuits-x86_64-clang-assert:cpp:./dockerfiles/Dockerfile.x86_64-linux-clang-assert:aztec3-circuits-x86_64-linux-clang-assert -) \ No newline at end of file