From 206f6ff103b665daa728cbbcea9e1da05ae16319 Mon Sep 17 00:00:00 2001
From: admin <alec@bryanmail.net>
Date: Mon, 27 Jul 2026 10:51:37 -0700
Subject: [PATCH] deploy.yml: fix root cause - CI_COMMIT_CHANGED_FILES does not
 exist in Woodpecker 3.16; the correct variable is CI_PIPELINE_FILES (JSON
 array format, e.g. [\"a/b.yaml\",\"c.yaml\"]). Updated all 5 usages
 (validate, provision-secrets x2, deploy, verify, notify-success) to read
 CI_PIPELINE_FILES and strip [ ] \" before splitting on comma. Removes
 temporary debug-env step.

---
 .woodpecker/deploy.yml | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/.woodpecker/deploy.yml b/.woodpecker/deploy.yml
index 8d362ee..18f4468 100644
--- a/.woodpecker/deploy.yml
+++ b/.woodpecker/deploy.yml
@@ -3,21 +3,16 @@ when:
     branch: main
 
 steps:
-  debug-env:
-    image: alpine:latest
-    commands:
-      - |
-        echo "=== DIAGNOSTIC: dumping all CI_* vars (temporary, remove after debugging) ==="
-        env | grep '^CI_' | sort
-        echo "=== END DIAGNOSTIC ==="
-
   validate:
     image: alpine:latest
     commands:
       - apk add --no-cache docker-cli docker-cli-compose
       - |
         # Collect changed stacks — both flat files and folder-based
-        CHANGED_FILES=$(echo "${CI_COMMIT_CHANGED_FILES}" | tr ',' '\n')
+        # NOTE: Woodpecker 3.16 exposes changed files as CI_PIPELINE_FILES, a JSON
+        # array string (e.g. [".woodpecker/deploy.yml","vaultwarden/vaultwarden.yaml"]).
+        # The older CI_COMMIT_CHANGED_FILES (comma-separated) no longer exists.
+        CHANGED_FILES=$(echo "${CI_PIPELINE_FILES}" | tr -d '[]"' | tr ',' '\n')
 
         # Flat: any root-level *.yaml
         FLAT=$(echo "$CHANGED_FILES" | grep -E '^[^/]+\.ya?ml$' || true)
@@ -122,14 +117,14 @@ steps:
       - chmod 600 ~/.ssh/id_rsa
       - ssh-keyscan -H ${SWARM_MANAGER_IP} >> ~/.ssh/known_hosts 2>/dev/null || true
       - |
-        CHANGED_FILES=$(echo "${CI_COMMIT_CHANGED_FILES}" | tr ',' '\n')
+        CHANGED_FILES=$(echo "${CI_PIPELINE_FILES}" | tr -d '[]"' | tr ',' '\n')
         FLAT_STACKS=$(echo "$CHANGED_FILES" | grep -E '^[^/]+\.yaml$' | sed 's/\.yaml$//' || true)
         FOLDER_STACKS=$(echo "$CHANGED_FILES" | grep -E '^[^/]+/' | cut -d/ -f1 | sort -u || true)
         ALL_STACKS=$(printf '%s\n%s' "$FLAT_STACKS" "$FOLDER_STACKS" | grep -v '^$' | sort -u)
         [ -z "$ALL_STACKS" ] && echo "No stacks changed, skipping" && exit 0
       - scp -o StrictHostKeyChecking=no deploy/create-secrets.sh root@${SWARM_MANAGER_IP}:/tmp/cs.sh
       - |
-        CHANGED_FILES=$(echo "${CI_COMMIT_CHANGED_FILES}" | tr ',' '\n')
+        CHANGED_FILES=$(echo "${CI_PIPELINE_FILES}" | tr -d '[]"' | tr ',' '\n')
         FLAT_STACKS=$(echo "$CHANGED_FILES" | grep -E '^[^/]+\.yaml$' | sed 's/\.yaml$//' || true)
         FOLDER_STACKS=$(echo "$CHANGED_FILES" | grep -E '^[^/]+/' | cut -d/ -f1 | sort -u || true)
         ALL_STACKS=$(printf '%s\n%s' "$FLAT_STACKS" "$FOLDER_STACKS" | grep -v '^$' | sort -u)
@@ -217,7 +212,7 @@ steps:
       - chmod 600 ~/.ssh/id_rsa
       - ssh-keyscan -H ${SWARM_MANAGER_IP} >> ~/.ssh/known_hosts 2>/dev/null || true
       - |
-        CHANGED_FILES=$(echo "${CI_COMMIT_CHANGED_FILES}" | tr ',' '\n')
+        CHANGED_FILES=$(echo "${CI_PIPELINE_FILES}" | tr -d '[]"' | tr ',' '\n')
         FLAT_STACKS=$(echo "$CHANGED_FILES" | grep -E '^[^/]+\.yaml$' | sed 's/\.yaml$//' || true)
         FOLDER_STACKS=$(echo "$CHANGED_FILES" | grep -E '^[^/]+/' | cut -d/ -f1 | sort -u || true)
         ALL_STACKS=$(printf '%s\n%s' "$FLAT_STACKS" "$FOLDER_STACKS" | grep -v '^$' | sort -u)
@@ -266,7 +261,7 @@ steps:
       - chmod 600 ~/.ssh/id_rsa
       - ssh-keyscan -H ${SWARM_MANAGER_IP} >> ~/.ssh/known_hosts 2>/dev/null || true
       - |
-        CHANGED_FILES=$(echo "${CI_COMMIT_CHANGED_FILES}" | tr ',' '\n')
+        CHANGED_FILES=$(echo "${CI_PIPELINE_FILES}" | tr -d '[]"' | tr ',' '\n')
         FLAT_STACKS=$(echo "$CHANGED_FILES" | grep -E '^[^/]+\.yaml$' | sed 's/\.yaml$//' || true)
         FOLDER_STACKS=$(echo "$CHANGED_FILES" | grep -E '^[^/]+/' | cut -d/ -f1 | sort -u || true)
         ALL_STACKS=$(printf '%s\n%s' "$FLAT_STACKS" "$FOLDER_STACKS" | grep -v '^$' | sort -u)
@@ -287,7 +282,7 @@ steps:
     commands:
       - apk add --no-cache curl
       - |
-        CHANGED=$(echo "${CI_COMMIT_CHANGED_FILES}" | tr ',' ' ')
+        CHANGED=$(echo "${CI_PIPELINE_FILES}" | tr -d '[]"' | tr ',' ' ')
         PAYLOAD=$(printf '{"title":"Swarm Deploy OK","text":"Stacks: %s Commit: %s","themeColor":"00aa00"}' "$CHANGED" "$CI_COMMIT_MESSAGE")
         curl -sf -X POST -H 'Content-Type: application/json' -d "$PAYLOAD" "$TEAMS_WEBHOOK" || true
     when: