From c7b3ddf4b205995f452be35edfbf1e4e76692dba Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Tue, 30 Sep 2025 10:43:52 -0400 Subject: [PATCH] Fixing service generation step in Renovate PR deploy flow. --- .gitea/workflows/renovate-pr-deploy.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/renovate-pr-deploy.yml b/.gitea/workflows/renovate-pr-deploy.yml index fd3d9a3c..df72eff1 100644 --- a/.gitea/workflows/renovate-pr-deploy.yml +++ b/.gitea/workflows/renovate-pr-deploy.yml @@ -67,15 +67,15 @@ jobs: set -euo pipefail 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 + yq eval '.services | keys | .[]' docker-compose-main.yml | sort > services_main.txt + yq eval '.services | keys | .[]' docker-compose-head.yml | sort > services_head.txt echo "Creating list of modified services..." : > service_changes.txt comm -12 services_main.txt services_head.txt | while read service; do - 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) + main_image=$(yq eval ".services.\"$service\".image // \"\"" docker-compose-main.yml) + head_image=$(yq eval ".services.\"$service\".image // \"\"" docker-compose-head.yml) if [ "$main_image" != "$head_image" ]; then echo "$service" >> service_changes.txt