From 45c76af7edcf906db95f6207c2876c4735314a40 Mon Sep 17 00:00:00 2001
From: Andrew Hughes-Onslow
 <andrew.hughes-onslow@digital.cabinet-office.gov.uk>
Date: Tue, 23 Jul 2024 00:20:02 +0100
Subject: [PATCH 1/2] ATO-762: Updated concurrency.

---
 .github/workflows/deploy-dev.yml         | 2 --
 .github/workflows/destroy-deployment.yml | 5 +++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml
index 0b9870929..53859b2b8 100644
--- a/.github/workflows/deploy-dev.yml
+++ b/.github/workflows/deploy-dev.yml
@@ -9,8 +9,6 @@ on:
     branches:
       - main
 
-concurrency: deploy-demo-${{ github.head_ref || github.ref_name }}
-
 permissions:
   id-token: write
   contents: read
diff --git a/.github/workflows/destroy-deployment.yml b/.github/workflows/destroy-deployment.yml
index f223332b5..f62f74325 100644
--- a/.github/workflows/destroy-deployment.yml
+++ b/.github/workflows/destroy-deployment.yml
@@ -5,6 +5,11 @@ on:
   workflow_dispatch:
   pull_request:
     types: [ closed ]
+  schedule:
+    #Every weekday at 10am
+    - cron: '0 10 * * 1-5'
+
+concurrency: deploy-demo-${{ github.head_ref || github.ref_name }}
 
 permissions:
   id-token: write

From b451dce88361a10a40e4650cc208410187504053 Mon Sep 17 00:00:00 2001
From: Andrew Hughes-Onslow
 <andrew.hughes-onslow@digital.cabinet-office.gov.uk>
Date: Tue, 23 Jul 2024 00:21:41 +0100
Subject: [PATCH 2/2] ATO-762: Removed weekly cleanup [deploy]

---
 .github/workflows/clean-up-deployments.yml | 29 ----------------------
 1 file changed, 29 deletions(-)
 delete mode 100644 .github/workflows/clean-up-deployments.yml

diff --git a/.github/workflows/clean-up-deployments.yml b/.github/workflows/clean-up-deployments.yml
deleted file mode 100644
index 70b0527ea..000000000
--- a/.github/workflows/clean-up-deployments.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: Clean up deployments
-run-name: Delete stale deployments
-
-on:
-  workflow_dispatch:
-  schedule:
-    # Every weekday at 10am
-    - cron: '0 10 * * 1-5'
-
-permissions: read-all
-
-jobs:
-  delete-fargate-deployments:
-    name: Clean up Fargate deployments
-    runs-on: ubuntu-latest
-    environment: development
-    concurrency: deploy-fargate-development-${{ github.head_ref || github.ref_name }}
-
-    permissions:
-      id-token: write
-      contents: read
-
-    steps:
-      - name: Deregister stale task definitions
-        uses: govuk-one-login/github-actions/aws/ecs/deregister-stale-task-definitions@94bfee8a40ab914626a7fb5bc459dd2c6a4ed435 # 5/03/2024
-        with:
-          aws-role-arn: ${{ vars.DEPLOYMENT_ROLE_ARN }}
-          family: self-service-frontend
-          container: self-service-frontend