ci: 修正 pr-review 的冲突判断与静态分析阈值
- mergeable=true 表示「可以合并」,之前误当成冲突,改为 false 才算冲突 - mergeable 为 null 时多等几轮(GitHub 异步计算) - flutter analyze 加 --no-fatal-infos --no-fatal-warnings: 仓库里有 44 条历史 warning/info,不该卡住合并,只让 error 失败 - 结论里区分「error 数」与「历史 warning/info 数」
This commit is contained in:
1 parent
ea1fa6b6d1
commit
0d383f96fb
1 file changed
+25
-13
@@ -61,19 +61,20 @@ jobs:
|
||||
echo "ahead=$AHEAD" >> "$GITHUB_OUTPUT"
|
||||
|
||||
# GitHub 的 mergeable 字段是异步计算的,前几次可能为 null,重试几次
|
||||
MERGEABLE="null"
|
||||
STATE="unknown"
|
||||
CONFLICT="unknown"
|
||||
for i in 1 2 3 4 5; do
|
||||
INFO=$(gh api "repos/${{ github.repository }}/pulls/${PR}" --jq '.mergeable, .mergeable_state' 2>/dev/null || true)
|
||||
CONFLICT=$(printf '%s\n' "$INFO" | sed -n '1p')
|
||||
STATE=$(printf '%s\n' "$INFO" | sed -n '2p')
|
||||
if [ "$CONFLICT" = "true" ] || [ "$CONFLICT" = "false" ]; then break; fi
|
||||
sleep 3
|
||||
for i in 1 2 3 4 5 6 7 8; do
|
||||
read -r MERGEABLE STATE <<< "$(gh api "repos/${{ github.repository }}/pulls/${PR}" \
|
||||
--jq '"\(.mergeable | tostring) \(.mergeable_state // "unknown")"' 2>/dev/null || echo 'null unknown')"
|
||||
# mergeable 只有 true / false 才是算完的结果,null 说明还在算
|
||||
if [ "$MERGEABLE" = "true" ] || [ "$MERGEABLE" = "false" ]; then break; fi
|
||||
sleep 4
|
||||
done
|
||||
|
||||
case "$CONFLICT" in
|
||||
false) echo "conflict=ok" >> "$GITHUB_OUTPUT" ;;
|
||||
true) echo "conflict=conflict" >> "$GITHUB_OUTPUT" ;;
|
||||
# 注意语义:mergeable=true 表示「可以合并」,false 才是冲突
|
||||
case "$MERGEABLE" in
|
||||
true) echo "conflict=ok" >> "$GITHUB_OUTPUT" ;;
|
||||
false) echo "conflict=conflict" >> "$GITHUB_OUTPUT" ;;
|
||||
*) echo "conflict=unknown" >> "$GITHUB_OUTPUT" ;;
|
||||
esac
|
||||
echo "merge_state=$STATE" >> "$GITHUB_OUTPUT"
|
||||
@@ -94,7 +95,9 @@ jobs:
|
||||
run: |
|
||||
set -o pipefail
|
||||
flutter pub get 2>&1 | tee ../flutter-pubget.log
|
||||
flutter analyze 2>&1 | tee ../flutter-analyze.log
|
||||
# 仓库里已有历史 warning / info,不应该让它们卡住合并;
|
||||
# 只把真正的 error 当失败。
|
||||
flutter analyze --no-fatal-infos --no-fatal-warnings 2>&1 | tee ../flutter-analyze.log
|
||||
exit ${PIPESTATUS[0]}
|
||||
|
||||
- id: summary
|
||||
@@ -111,13 +114,22 @@ jobs:
|
||||
set -e
|
||||
bad=0
|
||||
|
||||
# 静态分析结果分「错误」和「警告/提示」:只有错误才算不通过
|
||||
FE=$(grep -cE '^ *error •' flutter-analyze.log 2>/dev/null || true); FE=${FE:-0}
|
||||
FW=$(grep -cE '^ *(warning|info) •' flutter-analyze.log 2>/dev/null || true); FW=${FW:-0}
|
||||
|
||||
case "$DOTNET_OUTCOME" in
|
||||
success) DOTNET_LINE="✅ .NET 编译通过" ;;
|
||||
*) DOTNET_LINE="❌ .NET 编译失败"; bad=1 ;;
|
||||
esac
|
||||
case "$FLUTTER_OUTCOME" in
|
||||
success) FLUTTER_LINE="✅ Flutter 静态分析通过" ;;
|
||||
*) FLUTTER_LINE="❌ Flutter 静态分析有问题"; bad=1 ;;
|
||||
success)
|
||||
if [ "$FW" -gt 0 ]; then
|
||||
FLUTTER_LINE="✅ 无错误(另有 ${FW} 条历史 warning/info,未阻断)"
|
||||
else
|
||||
FLUTTER_LINE="✅ 无错误"
|
||||
fi ;;
|
||||
*) FLUTTER_LINE="❌ 有 ${FE} 个 error"; bad=1 ;;
|
||||
esac
|
||||
case "$CONFLICT" in
|
||||
ok) CONFLICT_LINE="✅ 与目标分支无冲突" ;;
|
||||
|
||||
Reference in new issue
Block a user