fix check auto merge condition

mgoerens · Aug 8, 2024 · 5327e34 · 5327e34
1 parent 87e799d
commit 5327e34
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -470,7 +470,7 @@ jobs:
           MERGE_LABELS: ""
 
       - name: Check for PR merge
-        if: ${{ needs.setup.outputs.run_build == 'true' }}
+        if: ${{ steps.merge_pr.conclusion == 'success' }}
         env:
           BOT_TOKEN: ${{ secrets.BOT_TOKEN }}
         run: |

diff --git a/scripts/src/precheck/precheck.py b/scripts/src/precheck/precheck.py
@@ -94,7 +94,7 @@ def main():
     pr_content_error_msg = ""
     if args.check_chart_submission:
         pr_content_error_msg = craft_pr_content_error_msg(s)
-        if not pr_content_error_msg:
+        if pr_content_error_msg:
             print(pr_content_error_msg)
             gitutils.add_output("pr-content-error-message", pr_content_error_msg)