Merge branch 'master' into jc/yp-fix-build

AztecProtocol · Oct 26, 2023 · 76babb3 · 76babb3
2 parents 29fe4ab + 9b6be22
commit 76babb3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -487,6 +487,17 @@ jobs:
           name: "Build"
           command: build mainnet-fork | add_timestamps
 
+  deploy-mainnet-fork:
+    machine:
+      image: ubuntu-2204:2023.07.2
+    resource_class: medium
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Deploy mainnet fork"
+          command: deploy_ecr mainnet-fork
+
   aztec-faucet:
     machine:
       image: ubuntu-2204:2023.07.2
@@ -1235,6 +1246,10 @@ workflows:
       - noir-contracts-build: *defaults
 
       - mainnet-fork: *defaults
+      - deploy-mainnet-fork:
+          requires:
+            - mainnet-fork
+          <<: *deploy_defaults
 
       # Yarn Project
       - yarn-project-base:

diff --git a/iac/mainnet-fork/terraform/main.tf b/iac/mainnet-fork/terraform/main.tf
@@ -228,7 +228,7 @@ resource "aws_ecs_service" "aztec_mainnet_fork" {
   }
 
   load_balancer {
-    target_group_arn = aws_alb_target_group.aztec_mainnet_fork.arn
+    target_group_arn = aws_alb_target_group.mainnet_fork.arn
     container_name   = "aztec-network-mainnet-fork"
     container_port   = 80
   }
@@ -253,7 +253,7 @@ resource "aws_lb_listener_rule" "aztec_mainnet_fork_route" {
 
   action {
     type             = "forward"
-    target_group_arn = aws_alb_target_group.aztec_mainnet_fork.arn
+    target_group_arn = aws_alb_target_group.mainnet_fork.arn
   }
 
   condition {