fix: master (#1981)

AztecProtocol · Sep 4, 2023 · 6bfb053 · 6bfb053
1 parent abfa6c0
commit 6bfb053
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/circuits/cpp/barretenberg/.gitrepo b/circuits/cpp/barretenberg/.gitrepo
@@ -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
diff --git a/yarn-project/canary/scripts/docker-compose-e2e-sandbox.yml b/yarn-project/canary/scripts/docker-compose-e2e-sandbox.yml
@@ -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

diff --git a/yarn-project/canary/scripts/run_tests b/yarn-project/canary/scripts/run_tests
@@ -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
diff --git a/yarn-project/end-to-end/scripts/run_tests_local b/yarn-project/end-to-end/scripts/run_tests_local
@@ -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