Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: master #1981

Merged
merged 6 commits into from
Sep 4, 2023
Merged

fix: master #1981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
21cb22b
git subrepo pull --force circuits/cpp/barretenberg
ludamad Sep 4, 2023
10772d3
Fix bb
ludamad Sep 4, 2023
f7c290f
Merge branch 'master' of https://github.com/AztecProtocol/aztec3-pack…
ludamad Sep 4, 2023
b00790b
fix master
ludamad Sep 4, 2023
2a620a2
Merge branch 'fix/bump-bb' into ad/fix-ci
ludamad Sep 4, 2023
cbe0b56
fix e2e sandbox test
ludamad Sep 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions circuits/cpp/barretenberg/.gitrepo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[subrepo]
remote = https://github.com/AztecProtocol/barretenberg
branch = master
commit = 155e32ba1498bb18ebbd86d784aea8b56f910f8f
parent = 74c83c5e1436f391eef435926c2da1d508d67713
commit = c6c469aa5da7c6973f656ddf8af4fb20c3e8e4f6
parent = 0a2a515ecf52849cce1e45a7b39f44d420b43f34
method = merge
cmdver = 0.4.6
2 changes: 1 addition & 1 deletion yarn-project/canary/scripts/docker-compose-e2e-sandbox.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ services:
- '8545:8545'

sandbox:
image: $ECR_URL/aztec-sandbox:cache-$CONTENT_HASH
image: aztecprotocol/sandbox:latest
environment:
DEBUG: 'aztec:*'
ETHEREUM_HOST: http://fork:8545
Expand Down
4 changes: 4 additions & 0 deletions yarn-project/canary/scripts/run_tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,9 @@ IMAGE_URI=$($(git rev-parse --show-toplevel)/build-system/scripts/calculate_imag
docker pull $IMAGE_URI
docker tag $IMAGE_URI aztecprotocol/canary:latest

SANDBOX_IMAGE_URI=$($(git rev-parse --show-toplevel)/build-system/scripts/calculate_image_uri aztec-sandbox)
docker pull $SANDBOX_IMAGE_URI
docker tag $SANDBOX_IMAGE_URI aztecprotocol/sandbox:latest

docker-compose rm -f
docker-compose -f $COMPOSE_FILE up --exit-code-from canary
6 changes: 4 additions & 2 deletions yarn-project/end-to-end/scripts/run_tests_local
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ export COMPOSE_FILE=${2:-./scripts/docker-compose.yml}

aws ecr get-login-password --region us-east-2 | docker login --username AWS --password-stdin 278380418400.dkr.ecr.us-east-2.amazonaws.com

BS=$(git rev-parse --show-toplevel)/build-system/scripts

for REPO in end-to-end; do
docker pull 278380418400.dkr.ecr.us-east-2.amazonaws.com/$REPO:cache-$CONTENT_HASH
docker tag 278380418400.dkr.ecr.us-east-2.amazonaws.com/$REPO:cache-$CONTENT_HASH aztecprotocol/$REPO:latest
docker pull $($BS/calculate_image_uri $REPO)
docker tag $($BS/calculate_image_uri $REPO) aztecprotocol/$REPO:latest
done

docker-compose -f $COMPOSE_FILE rm -f
Expand Down