infra: remove --fail-with-body from pr-description.sh

checkstyle · Nov 26, 2022 · f127566 · f127566
1 parent 1fe9ff3
commit f127566
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.ci/pr-description.sh b/.ci/pr-description.sh
@@ -4,7 +4,7 @@ set -e
 
 if [[ ! $PULL_REQUEST =~ ^([0-9]*)$ ]]; then exit 0; fi
 LINK_COMMITS=https://api.github.com/repos/checkstyle/checkstyle/pulls/$PULL_REQUEST/commits
-COMMITS=$(curl --fail-with-body -s -H "Authorization: token $READ_ONLY_TOKEN" "$LINK_COMMITS" \
+COMMITS=$(curl -s -H "Authorization: token $READ_ONLY_TOKEN" "$LINK_COMMITS" \
              | jq '.[0] | .commit.message')
 echo 'Commit messages from github: '"${COMMITS:0:60}"...
 ISSUE_NUMBER=$(echo "$COMMITS" | sed -e 's/^.*Issue //' | sed -e 's/:.*//')
@@ -13,15 +13,15 @@ if [[ $ISSUE_NUMBER =~ ^#[0-9]+$ ]]; then
     LINK_PR=https://api.github.com/repos/checkstyle/checkstyle/pulls/$PULL_REQUEST
     LINK_ISSUE=https://api.github.com/repos/checkstyle/checkstyle/issues/${ISSUE_NUMBER:1}
     REGEXP=($ISSUE_NUMBER\|https://github.com/checkstyle/checkstyle/issues/${ISSUE_NUMBER:1})
-    PR_DESC=$(curl --fail-with-body -s -H "Authorization: token $READ_ONLY_TOKEN" "$LINK_PR" \
+    PR_DESC=$(curl -s -H "Authorization: token $READ_ONLY_TOKEN" "$LINK_PR" \
                 | jq '.body' | grep -E "$REGEXP" | cat )
     echo 'PR Description grepped:'"${PR_DESC:0:80}"
     if [[ -z $PR_DESC ]]; then
          echo 'Please put a reference to an Issue in the PR description,'
          echo 'this will bind the Issue to your PR in Github'
          RESULT=1;
        fi
-    LABEL_APRV=$(curl --fail-with-body -s -H "Authorization: token $READ_ONLY_TOKEN" "$LINK_ISSUE" \
+    LABEL_APRV=$(curl -s -H "Authorization: token $READ_ONLY_TOKEN" "$LINK_ISSUE" \
                    | jq '.labels [] | .name' | grep approved | cat | wc -l )
     if [[ $LABEL_APRV == 0 ]]; then
          echo 'You are providing a PR for an Issue that is not approved yet,'

diff --git a/config/checkstyle_non_main_files_suppressions.xml b/config/checkstyle_non_main_files_suppressions.xml
@@ -156,8 +156,9 @@
   <!-- azure does not support this curl command -->
   <suppress id="properCurlCommand" files=".ci[\\/]test-spelling-unknown-words\.sh"/>
   <suppress id="properCurlCommand" files=".ci[\\/]run-link-check-plugin\.sh"/>
-  <!-- other images that do not support newer curl commands -->
+  <!-- other images that do not support newer curl commands until #12451 -->
   <suppress id="properCurlCommand" files=".ci[\\/]sonar_break_build\.sh"/>
   <suppress id="properCurlCommand" files=".ci[\\/]no_old_refs\.sh"/>
+  <suppress id="properCurlCommand" files=".ci[\\/]pr-description\.sh"/>
 
 </suppressions>