...

.gitea/workflows/pr-docker-deploy.yml

@@ -77,34 +77,31 @@ jobs:
       - name: Detect added, deleted, and modified services
         id: detect_services
         run: |
-          set -euo pipefail
+          echo "Getting services from main and ${{ github.ref_name }}"
+          yq '.services | keys | .[]' docker-compose-main.yml | sort > services_main.txt
+          yq '.services | keys | .[]' docker-compose-head.yml | sort > services_head.txt
 
-          echo "Flattening docker-compose files..."
+          echo "Creating list of modified services..."
-          yq eval '... comments=""' docker-compose-old.yml > docker-compose-old-flat.yml
+          touch service_changes.txt
-          yq eval '... comments=""' docker-compose-new.yml > docker-compose-new-flat.yml
 
-          echo "Getting service names..."
+          comm -13 services_main.txt services_head.txt | while read service; do
-          yq eval '.services | keys | .[]' docker-compose-old-flat.yml | sort > services_old.txt
+            echo "$service: added" >> service_changes.txt
-          yq eval '.services | keys | .[]' docker-compose-new-flat.yml | sort > services_new.txt
+          done
 
-          echo "Checking for image changes..."
+          comm -12 services_main.txt services_head.txt | while read service; do
-          : > service_changes.txt
+            yq ".services[\"$service\"]" docker-compose-main.yml > tmp_main.yml
-
+            yq ".services[\"$service\"]" docker-compose-head.yml > tmp_head.yml
-          comm -12 services_old.txt services_new.txt | while read service; do
+            if ! diff -q tmp_main.yml tmp_head.yml > /dev/null; then
-            old_image=$(yq eval-all --yaml-fix-merge-anchor-to-spec=true ".services[\"$service\"].image // \"\"" docker-compose-old-flat.yml)
+              echo "$service: modified" >> service_changes.txt
-            new_image=$(yq eval-all --yaml-fix-merge-anchor-to-spec=true ".services[\"$service\"].image // \"\"" docker-compose-new-flat.yml)
-
-            if [ "$old_image" != "$new_image" ]; then
-              echo "$service" >> service_changes.txt
             fi
           done
 
-          echo "Detected services with changed images:"
+          echo "Detected service changes:"
-          cat service_changes.txt || true
+          cat service_changes.txt
 
-          # Prepare multiline output for GitHub Actions
+          mod_svcs=$(cut -d':' -f1 service_changes.txt | sort | uniq | tr '\n' ' ' | sed 's/ *$//')
           echo "docker_svc_list<<EOF" >> "$GITHUB_OUTPUT"
-          sort -u service_changes.txt >> "$GITHUB_OUTPUT"
+          echo "$mod_svcs" >> "$GITHUB_OUTPUT"
           echo "EOF" >> "$GITHUB_OUTPUT"
 
       - name: List of Services for (Re)Deployment