From 370da72ad691e672e4f3dd9129a6c8f51dae0196 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 30 Sep 2025 07:14:41 -0400 Subject: [PATCH] Fixing service generation step in Renovate PR deploy flow. --- .gitea/workflows/renovate-pr-deploy.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/renovate-pr-deploy.yml b/.gitea/workflows/renovate-pr-deploy.yml index d5a77de3..4cffda39 100644 --- a/.gitea/workflows/renovate-pr-deploy.yml +++ b/.gitea/workflows/renovate-pr-deploy.yml @@ -53,16 +53,17 @@ jobs: run: | git fetch origin ${{ github.event.pull_request.base.ref }} - # Extract image refs (service -> image) from base and head + # Extract service=image pairs from HEAD (PR merge result) yq -r '.services | to_entries[] | "\(.key)=\(.value.image // "")"' docker-compose.yml \ | sort > services_head.txt + # Extract service=image pairs from BASE (main branch) git show origin/${{ github.event.pull_request.base.ref }}:docker-compose.yml \ | yq -r '.services | to_entries[] | "\(.key)=\(.value.image // "")"' \ - | sort > services_main.txt + | sort > services_main.txt || true echo "Comparing images between base and head..." - touch service_changes.txt + : > service_changes.txt while IFS== read -r svc img; do base_img=$(grep "^$svc=" services_main.txt | cut -d= -f2- || true) @@ -74,15 +75,13 @@ jobs: echo "Detected service changes:" cat service_changes.txt || true - mod_svcs=$(sort -u service_changes.txt) + mod_svcs=$(sort -u service_changes.txt | xargs) if [ -z "$mod_svcs" ]; then - echo "::warning::No service image changes detected. Skipping selective deployment." + echo "docker_svc_list=" >> "$GITHUB_OUTPUT" + else + echo "docker_svc_list=$mod_svcs" >> "$GITHUB_OUTPUT" fi - echo "docker_svc_list<> "$GITHUB_OUTPUT" - echo "$mod_svcs" >> "$GITHUB_OUTPUT" - echo "EOF" >> "$GITHUB_OUTPUT" - - name: List of Services for (Re)Deployment run: | echo -e "${{ steps.services.outputs.docker_svc_list }}"