Pass args to jq via --arg

hmac · hmac · commit cf0611d1e7d4 · 2022-04-14T13:50:41.000+12:00
diff --git a/.github/workflows/post-pr-comment.yml b/.github/workflows/post-pr-comment.yml
@@ -53,11 +53,11 @@ jobs:
             # - comment belongs to the PR with number $PR_NUMBER
             # - comment starts with the expected prefix ("QHelp previews")
             # - comment author is github-actions[bot]
-            FILTER="select(.issue_url | test(\"${GITHUB_REPOSITORY}/issues/${PR_NUMBER}$\")) \
-                                      | select(.body | test(\"^${COMMENT_PREFIX}\"))         \
-                                      | select(.user.login == \"${COMMENT_AUTHOR}\")         \
-                                      | .id"
-            COMMENT_ID=$(gh api "repos/${GITHUB_REPOSITORY}/issues/comments/${RAW_COMMENT_ID}" | jq "${FILTER}")
+            FILTER='select(.issue_url | endswith($repo+"/issues/"+$pr))
+                  | select(.body | startswith($prefix))
+                  | select(.user.login == $author)
+                  | .id'
+            COMMENT_ID=$(gh api "repos/${GITHUB_REPOSITORY}/issues/comments/${COMMENT_ID}" | jq --arg repo "${GITHUB_REPOSITORY}" --arg pr "${PR_NUMBER}" --arg prefix "${COMMENT_PREFIX}" --arg author "${COMMENT_AUTHOR}" "${FILTER}")
             if [ $COMMENT_ID ]
             then
               # Update existing comment
