Skip to content

Commit 17a7ee7

Browse files
committed
[CI] .workflows
1 parent 3166d80 commit 17a7ee7

1 file changed

Lines changed: 13 additions & 3 deletions

File tree

.github/workflows/build-exe.yml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,14 @@ jobs:
6363
badge3="[![访问统计](https://komarev.com/ghpvc/?username=${VIEW_COUNTER_ID}&label=Views&style=flat-square&color=brightgreen)](https://github.com/11273/mooc-work-answer/releases/tag/${{ env.TAG_NAME }})"
6464
header="## 🚀 版本更新 ${{ env.TAG_NAME }}"
6565
66-
# 获取提交日志并格式化
66+
# 获取提交日志并格式化 - 使用更可靠的方法
6767
if [ "${{ env.PREV_TAG }}" ]; then
68-
log=$(git log ${{ env.PREV_TAG }}..HEAD --pretty=format:"- %s" --no-merges | head -20)
68+
# 使用标签之间的提交范围,确保包含所有提交
69+
log=$(git rev-list ${{ env.PREV_TAG }}..${{ env.TAG_NAME }} --pretty=format:"- %s" --no-merges | grep "^-" | head -20)
70+
# 如果上面的命令没有结果,回退到原方法
71+
if [ -z "$log" ]; then
72+
log=$(git log ${{ env.PREV_TAG }}..HEAD --pretty=format:"- %s" --no-merges | head -20)
73+
fi
6974
else
7075
log=$(git log --pretty=format:"- %s" --no-merges | head -10)
7176
fi
@@ -251,7 +256,12 @@ jobs:
251256
TAG_NAME=${{github.ref_name}}
252257
if git describe --tags --abbrev=0 HEAD^ 2>/dev/null; then
253258
PREV_TAG=$(git describe --tags --abbrev=0 HEAD^)
254-
log=$(git log ${PREV_TAG}..HEAD --pretty=format:"- %s" --no-merges | head -20)
259+
# 使用标签之间的提交范围,确保包含所有提交
260+
log=$(git rev-list ${PREV_TAG}..${TAG_NAME} --pretty=format:"- %s" --no-merges | grep "^-" | head -20)
261+
# 如果上面的命令没有结果,回退到原方法
262+
if [ -z "$log" ]; then
263+
log=$(git log ${PREV_TAG}..HEAD --pretty=format:"- %s" --no-merges | head -20)
264+
fi
255265
else
256266
log=$(git log --pretty=format:"- %s" --no-merges | head -10)
257267
fi

0 commit comments

Comments
 (0)