From 05a2fbc42d38b8b79d99742189dcd5858e3ecefa Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Fri, 5 Sep 2025 06:00:51 -0400
Subject: [PATCH] Splitting Renovate workflows in two.

---
 .gitea/workflows/check-renovate.yml           | 20 ++++++++++
 ...vate-deploy.yml => renovate-pr-deploy.yml} | 38 +++++++++++++------
 2 files changed, 46 insertions(+), 12 deletions(-)
 create mode 100644 .gitea/workflows/check-renovate.yml
 rename .gitea/workflows/{renovate-deploy.yml => renovate-pr-deploy.yml} (67%)

diff --git a/.gitea/workflows/check-renovate.yml b/.gitea/workflows/check-renovate.yml
new file mode 100644
index 00000000..1721d46b
--- /dev/null
+++ b/.gitea/workflows/check-renovate.yml
@@ -0,0 +1,20 @@
+name: Check Renovate Updates
+
+on:
+  pull_request:
+    branches:
+      - main
+    types: [opened, synchronize, reopened]
+    paths:
+      - 'docker-compose.yml'
+
+jobs:
+  validate:
+    runs-on: ubuntu-latest
+    if: ${{ contains(toLower(github.event.pull_request.user.login), 'renovate') }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Validate docker-compose.yml
+        run: docker compose config
diff --git a/.gitea/workflows/renovate-deploy.yml b/.gitea/workflows/renovate-pr-deploy.yml
similarity index 67%
rename from .gitea/workflows/renovate-deploy.yml
rename to .gitea/workflows/renovate-pr-deploy.yml
index b6f19ea8..eaea2af5 100644
--- a/.gitea/workflows/renovate-deploy.yml
+++ b/.gitea/workflows/renovate-pr-deploy.yml
@@ -1,24 +1,35 @@
 name: Deploy Renovate Updates
 
 on:
-  push:
-    branches:
-      - main
+  workflow_run:
+    workflows: ["Check Renovate Updates"]
+    types:
+      - completed
 
 jobs:
   deploy:
-    name: Deploy Updated Services With Dependencies
     runs-on: ubuntu-latest
-    # Only run if commit author name contains "renovate" (case-insensitive)
-    if: ${{ contains(toLower(github.event.head_commit.author.name), 'renovate') }}
+    if: >
+      ${{
+        github.event.workflow_run.conclusion == 'success' &&
+        contains(toLower(github.event.workflow_run.head_commit.author.name), 'renovate')
+      }}
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # we need full history to compute merge-base
 
       - name: Set up Docker
         uses: docker/setup-buildx-action@v3
 
+      - name: Log in to Docker (if needed)
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
       - name: Install yq
         run: |
           sudo wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/bin/yq
@@ -29,15 +40,18 @@ jobs:
         run: |
           echo "Finding modified services in docker-compose.yml..."
 
-          # All services
-          ALL_SERVICES=$(yq e '.services | keys | .[]' docker-compose.yml)
+          # Find merge-base with previous main commit
+          BASE_COMMIT=$(git merge-base HEAD HEAD~1)
 
-          # Services changed in last commit
-          CHANGED_SERVICES=$(git diff --name-only HEAD~1 HEAD docker-compose.yml | xargs -I{} yq e '.services | keys | .[]' {})
+          # Extract changed services between merge-base and HEAD
+          CHANGED_SERVICES=$(git diff --name-only $BASE_COMMIT HEAD -- docker-compose.yml \
+            | xargs -r -I{} yq e '.services | keys | .[]' {})
 
-          echo "Changed services: $CHANGED_SERVICES"
+          if [ -z "$CHANGED_SERVICES" ]; then
+            echo "No services changed, skipping."
+            exit 0
+          fi
 
-          # Recursively collect dependencies
           declare -A VISITED
           ALL_DEPLOY=()