add check merge of check-commit

syzxlyx · Jul 4, 2019 · b12d9b5 · b12d9b5
1 parent 3cba081
commit b12d9b5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/codecov.yml b/codecov.yml
@@ -12,11 +12,11 @@ coverage:
     project:
       app:
         target: 70
-        threshold: 0.1
+        threshold: 0.2
         paths: "!test/"
       default:
         target: 80
-        threshold: 0.1
+        threshold: 0.2
     patch:
       default:
         target: 10

diff --git a/tools/ci/check-commit.sh b/tools/ci/check-commit.sh
@@ -86,6 +86,11 @@ function check_PR_limit()
         LOG_ERROR "${commits} commits, limit is ${commit_limit}"
         exit 1
     fi
+    local merges=$(git log --format=%s HEAD^..HEAD | grep -i merge | wc -l)
+    if [ ${merges} -gt 2 ];then
+        LOG_ERROR "PR contain merge : ${merges}, Please rebase!"
+        exit 1
+    fi
     LOG_INFO "modify ${files} files, insert ${insertions} lines, delete ${deletions} lines. Total ${commits} commits."
 }