From 7a1b6f72ad6ad07fd29708601ac9105a894ab0ca Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 30 Sep 2025 10:37:49 -0400 Subject: [PATCH] Fixing service generation step in Renovate PR deploy flow. --- .gitea/workflows/renovate-pr-deploy.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/renovate-pr-deploy.yml b/.gitea/workflows/renovate-pr-deploy.yml index b340f12f..fd3d9a3c 100644 --- a/.gitea/workflows/renovate-pr-deploy.yml +++ b/.gitea/workflows/renovate-pr-deploy.yml @@ -60,14 +60,12 @@ jobs: cp docker-compose.yml docker-compose-head.yml - - name: Detect added, deleted, and modified services + - name: Detect modified services id: detect_services shell: bash run: | set -euo pipefail - yq --version - echo "Getting services from main and head" yq '.services | keys | .[]' docker-compose-main.yml | sort > services_main.txt yq '.services | keys | .[]' docker-compose-head.yml | sort > services_head.txt @@ -75,20 +73,19 @@ jobs: echo "Creating list of modified services..." : > service_changes.txt - # Modified services (image changes) comm -12 services_main.txt services_head.txt | while read service; do - main_image=$(yq ".services.\"$service\".image // \"\"" docker-compose-main.yml) - head_image=$(yq ".services.\"$service\".image // \"\"" docker-compose-head.yml) + main_image=$(yq eval --yaml-merge ".services.\"$service\".image // \"\"" docker-compose-main.yml) + head_image=$(yq eval --yaml-merge ".services.\"$service\".image // \"\"" docker-compose-head.yml) + if [ "$main_image" != "$head_image" ]; then - echo "$service: modified" >> service_changes.txt + echo "$service" >> service_changes.txt fi done - echo "Detected service changes:" + echo "Detected modified services:" cat service_changes.txt || true - # Flatten into single space-separated list - mod_svcs=$(cut -d: -f1 service_changes.txt | sort -u | xargs echo -n) + mod_svcs=$(sort -u service_changes.txt | xargs echo -n) echo "docker_svc_list=$mod_svcs" >> "$GITHUB_OUTPUT"