fix CI

Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>

Author: jkroepke

.github/workflows/renovate-custom-hooks.yaml

@@ -44,66 +44,62 @@ jobs:
         run: |
           # Define the target directory
           TARGET_DIR="."
-
+          
           # Fetch deleted files in the target directory
           DELETED_FILES=$(git diff --diff-filter=D --name-only HEAD -- "$TARGET_DIR")
-
+          
           # Fetch added/modified files in the target directory
           MODIFIED_FILES=$(git diff --diff-filter=ACM --name-only HEAD -- "$TARGET_DIR")
           
-          # Collect deletions
-          DELETIONS_FILE=$(mktemp)
-          echo '[]' > "$DELETIONS_FILE"
+          # Create a temporary file for JSON output
+          FILE_CHANGES_JSON_FILE=$(mktemp)
           
-          git diff --diff-filter=D --name-only HEAD -- "$TARGET_DIR" | while read -r file; do
-            jq --arg path "$file" '. += [{"path": $path}]' "$DELETIONS_FILE" > "$DELETIONS_FILE.tmp"
-            mv "$DELETIONS_FILE.tmp" "$DELETIONS_FILE"
-          done
+          # Initialize JSON structure
+          echo '{ "deletions": [], "additions": [] }' > "$FILE_CHANGES_JSON_FILE"
           
-          # Collect additions
-          ADDITIONS_FILE=$(mktemp)
-          echo '[]' > "$ADDITIONS_FILE"
+          # Add deletions
+          for file in $DELETED_FILES; do
+            jq --arg path "$file" '.deletions += [{"path": $path}]' "$FILE_CHANGES_JSON_FILE" > "$FILE_CHANGES_JSON_FILE.tmp"
+            mv "$FILE_CHANGES_JSON_FILE.tmp" "$FILE_CHANGES_JSON_FILE"
+          done
           
-          git diff --diff-filter=ACM --name-only HEAD -- "$TARGET_DIR" | while read -r file; do
-            BASE64_CONTENT=$(base64 -w 0 <"$file")
-            jq --arg path "$file" --arg content "$BASE64_CONTENT" '. += [{"path": $path, "contents": $content}]' "$ADDITIONS_FILE" > "$ADDITIONS_FILE.tmp"
-            mv "$ADDITIONS_FILE.tmp" "$ADDITIONS_FILE"
+          # Prepare additions (new or modified files)
+          for file in $MODIFIED_FILES; do
+            jq --rawfile content "$file" --arg path "$file" \
+              '.additions += [{"path": $path, "contents": ($content | @base64)}]' \
+              "$FILE_CHANGES_JSON_FILE" > "$FILE_CHANGES_JSON_FILE.tmp"
+            mv "$FILE_CHANGES_JSON_FILE.tmp" "$FILE_CHANGES_JSON_FILE"
           done
-
+          
           # Create a temporary file for the final JSON payload
           JSON_PAYLOAD_FILE=$(mktemp)
-
+          
           # Construct the final JSON using jq and store it in a file
-          jq -n \
-            --slurpfile deletions "$DELETIONS_FILE" \
-            --slurpfile additions "$ADDITIONS_FILE" \
-            --arg repo "$GITHUB_REPOSITORY" \
-            --arg branch "$GITHUB_HEAD_REF" \
-            --arg message "post upgrade changes from renovate" \
-            --arg expectedOid "$GITHUB_SHA" \
-            '{
-              query: "mutation ($input: CreateCommitOnBranchInput!) {
-                createCommitOnBranch(input: $input) { 
-                  commit { 
-                    url 
-                  } 
-                } 
-              }",
-              variables: {
-                input: {
-                  branch: {
-                    repositoryNameWithOwner: $repo,
-                    branchName: $branch
-                  },
-                  message: { headline: $message },
-                  fileChanges: {
-                    deletions: $deletions[0],
-                    additions: $additions[0]
-                  },
-                  expectedHeadOid: $expectedOid
-                }
-              }
-            }' > "$JSON_PAYLOAD_FILE"
+          jq -n --arg repo "$GITHUB_REPOSITORY" \
+                --arg branch "$GITHUB_HEAD_REF" \
+                --arg message "post upgrade changes from renovate" \
+                --arg expectedOid "$GITHUB_SHA" \
+                --slurpfile fileChanges "$FILE_CHANGES_JSON_FILE" \
+                '{
+                  query: "mutation ($input: CreateCommitOnBranchInput!) {
+                    createCommitOnBranch(input: $input) { 
+                      commit { 
+                        url 
+                      } 
+                    } 
+                  }",
+                  variables: {
+                    input: {
+                      branch: {
+                        repositoryNameWithOwner: $repo,
+                        branchName: $branch
+                      },
+                      message: { headline: $message },
+                      fileChanges: $fileChanges[0],
+                      expectedHeadOid: $expectedOid
+                    }
+                  }
+                }' > "$JSON_PAYLOAD_FILE"
           
           # Call GitHub API
           curl https://api.github.com/graphql -f \