From 38516482370f9b387bcef78bd4276f3cf7e76e35 Mon Sep 17 00:00:00 2001 From: Wenxuan Zhao Date: Tue, 23 Oct 2018 21:52:07 -0700 Subject: [PATCH] =?UTF-8?q?=E7=BB=95=E8=BF=87=E6=A3=80=E6=9F=A5=EF=BC=9A?= =?UTF-8?q?=E5=9C=A8=E6=94=B6=E9=9B=86=E9=98=B6=E6=AE=B5=E6=89=93=E5=8D=B0?= =?UTF-8?q?=20PR=20=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/check.sh | 1 - scripts/check/collect.sh | 5 ++++- scripts/check/info.sh | 4 ---- 3 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 scripts/check/info.sh diff --git a/scripts/check.sh b/scripts/check.sh index 539f2426e7..ba5707fbf6 100644 --- a/scripts/check.sh +++ b/scripts/check.sh @@ -4,7 +4,6 @@ set -e CHECK_DIR="$(dirname "$0")/check" # sh "${CHECK_DIR}/check.sh" # 需要依赖,暂时禁用 -sh "${CHECK_DIR}/info.sh" sh "${CHECK_DIR}/collect.sh" sh "${CHECK_DIR}/analyze.sh" sh "${CHECK_DIR}/identify.sh" diff --git a/scripts/check/collect.sh b/scripts/check/collect.sh index d58246b120..dc6293e280 100644 --- a/scripts/check/collect.sh +++ b/scripts/check/collect.sh @@ -19,8 +19,11 @@ MERGE_BASE='HEAD^' && MERGE_BASE="$(git merge-base "$TARGET_BRANCH" HEAD)" echo "[收集] 找到分叉节点:${MERGE_BASE}" +echo "[收集] 变更摘要:" +git --no-pager show --summary "${MERGE_BASE}..HEAD" + { - git log --oneline "${MERGE_BASE}..HEAD" | grep -Eq '绕过检查' && { + git --no-pager log --oneline "${MERGE_BASE}..HEAD" | grep -Eq '绕过检查' && { touch /tmp/bypass echo "[收集] 已标记为绕过检查项" } diff --git a/scripts/check/info.sh b/scripts/check/info.sh deleted file mode 100644 index 2e8159fe0c..0000000000 --- a/scripts/check/info.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -# 打印 PR 信息 -echo ""