From 679797db48150b043c79d014490c39c70cd81726 Mon Sep 17 00:00:00 2001
From: jebw <jeb@jdwilkins.co.uk>
Date: Mon, 12 Feb 2024 09:33:56 +0000
Subject: [PATCH 1/2] HOTT-5096 Test dependabot prs

---
 .circleci/config.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0f66e1d6..eb6ca200 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,7 +5,6 @@ filter-not-main: &filter-not-main
     branches:
       ignore:
         - main
-        - /^dependabot/(?!docker/).*/
         - /^hotfix\/.+/
 
 filter-main: &filter-main

From ae4d13355b342b9c3330c52f33ede238a00616c3 Mon Sep 17 00:00:00 2001
From: jebw <jeb@jdwilkins.co.uk>
Date: Mon, 12 Feb 2024 11:05:31 +0000
Subject: [PATCH 2/2] HOTT-5096 Added approval confirm for dev deploy

Avoids dependabot PRs fighting over dev environment
---
 .circleci/config.yml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index eb6ca200..4ea4c30b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -213,14 +213,20 @@ workflows:
           ssm_parameter: "/development/DUTY_CALCULATOR_ECR_URL"
           <<: *filter-not-main
 
+      - confirm-deploy-for-qa?:
+          type: approval
+          requires:
+            - test
+            - plan-terraform-dev
+            - build-and-push-dev
+          <<: *filter-not-main
+
       - apply-terraform:
           name: apply-terraform-dev
           context: trade-tariff-terraform-aws-development
           environment: development
           requires:
-            - test
-            - plan-terraform-dev
-            - build-and-push-dev
+            - confirm-deploy-for-qa?
           <<: *filter-not-main
 
       - tariff/smoketests: