From c5c0b32f2023857d05a972c24d42d7462fd5cbfa Mon Sep 17 00:00:00 2001
From: whekin <stanislavkalishin@gmail.com>
Date: Mon, 16 Mar 2026 04:56:42 +0400
Subject: [PATCH] fix(cd): avoid deploying stale images and add cleanup policy

---
 .github/workflows/cd.yml | 44 +++++++++++++++++++++++++++++++++++++---
 infra/terraform/main.tf  | 16 +++++++++++++++
 2 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 391974a..6f9df7d 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -178,9 +178,26 @@ jobs:
           repo="${GCP_REGION}-docker.pkg.dev/${{ vars.GCP_PROJECT_ID }}/${ARTIFACT_REPOSITORY}"
           echo "bot_image=${repo}/bot:${deploy_sha}"       >> "$GITHUB_OUTPUT"
           echo "mini_image=${repo}/miniapp:${deploy_sha}"  >> "$GITHUB_OUTPUT"
+          echo "deploy_sha=${deploy_sha}"                  >> "$GITHUB_OUTPUT"
+
+      - name: Check for newer commits
+        id: check-newer
+        if: github.event_name == 'workflow_run'
+        run: |
+          git fetch origin "${{ github.event.workflow_run.head_branch }}"
+          latest_sha=$(git rev-parse "origin/${{ github.event.workflow_run.head_branch }}")
+          deploy_sha="${{ steps.images.outputs.deploy_sha }}"
+          
+          if [[ "$latest_sha" != "$deploy_sha" ]]; then
+             echo "::notice::Newer commit ($latest_sha) found on branch. Skipping deployment of $deploy_sha to avoid race conditions."
+             echo "skip=true" >> "$GITHUB_OUTPUT"
+          else
+             echo "skip=false" >> "$GITHUB_OUTPUT"
+          fi
 
       - name: Load Telegram bot token for command sync
         id: telegram-token
+        if: steps.check-newer.outputs.skip != 'true'
         run: |
           set +e
           token="$(gcloud secrets versions access latest \
@@ -203,6 +220,7 @@ jobs:
           } >> "$GITHUB_OUTPUT"
 
       - name: Deploy bot service
+        if: steps.check-newer.outputs.skip != 'true'
         run: |
           gcloud run deploy "household-${SERVICE_SUFFIX}-bot-api" \
             --image "${{ steps.images.outputs.bot_image }}" \
@@ -212,7 +230,17 @@ jobs:
             --allow-unauthenticated \
             --quiet
 
+      - name: Route traffic to latest bot revision
+        if: steps.check-newer.outputs.skip != 'true'
+        run: |
+          gcloud run services update-traffic "household-${SERVICE_SUFFIX}-bot-api" \
+            --region "${GCP_REGION}" \
+            --project "${{ vars.GCP_PROJECT_ID }}" \
+            --to-latest \
+            --quiet
+
       - name: Deploy mini app service
+        if: steps.check-newer.outputs.skip != 'true'
         run: |
           gcloud run deploy "household-${SERVICE_SUFFIX}-mini-app" \
             --image "${{ steps.images.outputs.mini_image }}" \
@@ -221,14 +249,24 @@ jobs:
             --allow-unauthenticated \
             --quiet
 
+      - name: Route traffic to latest mini app revision
+        if: steps.check-newer.outputs.skip != 'true'
+        run: |
+          gcloud run services update-traffic "household-${SERVICE_SUFFIX}-mini-app" \
+            --region "${GCP_REGION}" \
+            --project "${{ vars.GCP_PROJECT_ID }}" \
+            --to-latest \
+            --quiet
+
       - name: Sync Telegram commands
-        if: ${{ steps.telegram-token.outputs.available == 'true' }}
+        if: ${{ steps.telegram-token.outputs.available == 'true' && steps.check-newer.outputs.skip != 'true' }}
         env:
           TELEGRAM_BOT_TOKEN: ${{ steps.telegram-token.outputs.token }}
         run: bun run ops:telegram:commands set
 
       - name: Load webhook secret
         id: webhook-secret
+        if: steps.check-newer.outputs.skip != 'true'
         run: |
           secret_name="telegram-webhook-secret"
           if [[ "${SERVICE_SUFFIX}" == "dev" ]]; then
@@ -244,7 +282,7 @@ jobs:
           echo "secret=${secret}" >> "$GITHUB_OUTPUT"
 
       - name: Set Telegram Webhook
-        if: ${{ !cancelled() && steps.telegram-token.outputs.available == 'true' }}
+        if: ${{ !cancelled() && steps.telegram-token.outputs.available == 'true' && steps.check-newer.outputs.skip != 'true' }}
         env:
           TELEGRAM_BOT_TOKEN: ${{ steps.telegram-token.outputs.token }}
           TELEGRAM_WEBHOOK_SECRET: ${{ steps.webhook-secret.outputs.secret }}
@@ -264,7 +302,7 @@ jobs:
           bun run ops:telegram:webhook set
 
       - name: Verify Telegram Webhook
-        if: ${{ steps.telegram-token.outputs.available == 'true' }}
+        if: ${{ steps.telegram-token.outputs.available == 'true' && steps.check-newer.outputs.skip != 'true' }}
         env:
           TELEGRAM_BOT_TOKEN: ${{ steps.telegram-token.outputs.token }}
         run: |
diff --git a/infra/terraform/main.tf b/infra/terraform/main.tf
index 6173dcf..94b023f 100644
--- a/infra/terraform/main.tf
+++ b/infra/terraform/main.tf
@@ -19,6 +19,22 @@ resource "google_artifact_registry_repository" "containers" {
 
   labels = local.common_labels
 
+  cleanup_policies {
+    id     = "keep-last-10"
+    action = "KEEP"
+    most_recent_versions {
+      keep_count = 10
+    }
+  }
+
+  cleanup_policies {
+    id     = "delete-stale"
+    action = "DELETE"
+    condition {
+      older_than = "1209600s" # 14 days
+    }
+  }
+
   lifecycle {
     ignore_changes = [
       labels,