[yetus] branch main updated: YETUS-1069. no annotation for failing to apply PR (#204)

[aw]

This is an automated email from the ASF dual-hosted git repository.

aw pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/yetus.git


The following commit(s) were added to refs/heads/main by this push:
     new cabc15a  YETUS-1069. no annotation for failing to apply PR (#204)
cabc15a is described below

commit cabc15a75a65e2331abf31e27ad5cace9143e13a
Author: Allen Wittenauer <a...@apache.org>
AuthorDate: Tue Nov 17 12:34:08 2020 -0800

    YETUS-1069. no annotation for failing to apply PR (#204)
    
    Signed-off-by: Roman Shaposhnik <r...@apache.org>
---
 precommit/src/main/shell/test-patch.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/precommit/src/main/shell/test-patch.sh 
b/precommit/src/main/shell/test-patch.sh
index 93d2e12..66c6542 100755
--- a/precommit/src/main/shell/test-patch.sh
+++ b/precommit/src/main/shell/test-patch.sh
@@ -1443,6 +1443,9 @@ function apply_patch_file
 
   if [[ "${INPUT_APPLIED_FILE}" ==  "${INPUT_DIFF_FILE}" ]]; then
     add_vote_table_v2 '-0' patch "" "Used diff version of patch file. Binary 
files and potentially other changes not applied. Please rebase and squash 
commits if necessary."
+    if [[ "${GITHUB_ACTIONS}" == true ]]; then
+      echo "::warning::Used diff version. Binary files and potentially other 
changes not applied. Try a rebase and/or squashing commits."
+    fi
     big_console_header "Applying diff to ${PATCH_BRANCH}"
   else
     big_console_header "Applying patch to ${PATCH_BRANCH}"
@@ -1452,6 +1455,9 @@ function apply_patch_file
     echo "PATCH APPLICATION FAILED"
     ((RESULT = RESULT + 1))
     add_vote_table_v2 -1 patch "" "${PATCH_OR_ISSUE} does not apply to 
${PATCH_BRANCH}. Rebase required? Wrong Branch? See ${PATCH_NAMING_RULE} for 
help."
+    if [[ "${GITHUB_ACTIONS}" == true ]]; then
+      echo "::error::Cannot apply PR on top of ${PATCH_BRANCH}. Verify the 
branch, try a rebase, and/or squashing commits."
+    fi
     bugsystem_finalreport 1
     cleanup_and_exit 1
   fi