Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into lw/simulator_refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
LeilaWang committed Sep 26, 2023
2 parents 3a13cec + b730196 commit 4ffa0b9
Show file tree
Hide file tree
Showing 655 changed files with 13,221 additions and 21,319 deletions.
572 changes: 117 additions & 455 deletions .circleci/config.yml

Large diffs are not rendered by default.

11 changes: 7 additions & 4 deletions .github/workflows/mirror_repos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
# action failing due to upstream changes, a manual resolution
# PR with ./scripts/git_subrepo.sh pull will be needed.
name: Mirror Repositories

concurrency:
group: mirror-repositories
on:
schedule:
# Run the workflow every night at 2:00 AM UTC.
Expand Down Expand Up @@ -38,6 +35,8 @@ jobs:
mirror-to-build-system-repo:
runs-on: ubuntu-latest
# Force sequential.
needs: mirror-to-docs-repo
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -59,6 +58,8 @@ jobs:
mirror-to-barretenberg-repo:
runs-on: ubuntu-latest
# Force sequential.
needs: mirror-to-build-system-repo
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -80,6 +81,8 @@ jobs:
mirror-to-aztec-nr-repo:
runs-on: ubuntu-latest
# Force sequential.
needs: mirror-to-barretenberg-repo
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -97,4 +100,4 @@ jobs:
git rebase origin/master
git commit --amend -m "$(git log -1 --pretty=%B) [skip ci]"
git push
fi
fi
7 changes: 0 additions & 7 deletions .github/workflows/publish-bb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,13 +150,6 @@ jobs:
uses: actions/checkout@v3
with:
ref: ${{ inputs.tag || env.GITHUB_REF }}
# We need clang 14.0.3 or higher, as lower versions do not seem
# to be spec conformant. In particular std::span does not seem
# to follow the specifications.
# We need clang 15 because barretenberg uses concepts.
# clang 15 is the similar to Apple clang 14.
- name: Select Xcode version
run: sudo xcode-select -switch /Applications/Xcode_14.3.1.app

- name: Create Mac Build Environment
run: brew install cmake ninja
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "legacy-barretenberg-build-system"]
path = barretenberg/build-system
url = https://github.com/AztecProtocol/build-system
[submodule "l1-contracts/lib/openzeppelin-contracts"]
path = l1-contracts/lib/openzeppelin-contracts
url = https://github.com/openzeppelin/openzeppelin-contracts
Expand Down
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,15 @@ This repository uses CircleCI for continuous integration. Build steps are manage

All packages need to be included in the [build manifest](`build_manifest.json`), which declares what paths belong to each package, as well as dependencies between packages. When the CI runs, if none of the rebuild patterns or dependencies were changed, then the build step is skipped and the last successful image is re-tagged with the current commit. Read more on the [`build-system`](https://github.com/AztecProtocol/build-system) repository README.

It is faster to debug CI failures within a persistent ssh session compared to pushing and waiting. You can create a session with "Rerun step with SSH" on CircleCI which will generate an ssh command for debugging on a worker. Run that command locally and then do
```bash
cd project
./build-system/scripts/setup_env "$(git rev-parse HEAD)" "" "" ""
source /tmp/.bash_env*
{start testing your CI commands here}
```
This provide an interactive environment for debugging the CI test.

## Debugging

Logging goes through the [`info` and `debug`](barretenberg/cpp/src/barretenberg/common/log.hpp) functions in C++, and through the [DebugLogger](yarn-project/foundation/src/log/debug.ts) module in Typescript. To see the log output, set a `DEBUG` environment variable to the name of the module you want to debug, to `aztec:*`, or to `*` to see all logs.
Expand Down
Loading

0 comments on commit 4ffa0b9

Please sign in to comment.