Merge branch 'master' into myk_pr_comment_test

DFHack · May 22, 2024 · 20ba465 · 20ba465
2 parents 53c9bff + 07d15ac
commit 20ba465
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/.github/workflows/comment-pr.yml b/.github/workflows/comment-pr.yml
@@ -21,10 +21,13 @@ jobs:
       id: format
       run: |
         set -ex
-        echo "COMMENT_BODY=$(jq --raw-output .comment comment-info.json)" >>$GITHUB_ENV
-        echo "COMMENT_SEARCH=$(jq --raw-output .comment_search comment-info.json)" >> $GITHUB_ENV
-        echo "COMMENT_PR_NUMBER=$(jq --raw-output .pr_number comment-info.json)" >> $GITHUB_ENV
-        echo "COMMENT_UPDATE_ONLY=$(jq --raw-output 'if .update_only then 1 else 0 end' comment-info.json)" >> $GITHUB_ENV
+        echo 'body<<EOF' >>$GITHUB_OUTPUT
+        jq --raw-output .comment comment-info.json >>$GITHUB_OUTPUT
+        echo 'EOF' >>$GITHUB_OUTPUT
+
+        echo "COMMENT_SEARCH=$(jq --raw-output .comment_search comment-info.json)" >>$GITHUB_ENV
+        echo "COMMENT_PR_NUMBER=$(jq --raw-output .pr_number comment-info.json)" >>$GITHUB_ENV
+        echo "COMMENT_UPDATE_ONLY=$(jq --raw-output 'if .update_only then 1 else 0 end' comment-info.json)" >>$GITHUB_ENV
     - name: Find existing comment
       id: find_comment
       uses: peter-evans/find-comment@v3
@@ -38,5 +41,5 @@ jobs:
       with:
         issue-number: ${{ env.COMMENT_PR_NUMBER }}
         comment-id: ${{ steps.find_comment.outputs.comment-id }}
-        body: ${{ env.COMMENT_BODY }}
+        body: ${{ steps.format.outputs.body }}
         edit-mode: replace