From 726fef72b0de13a996be73e34cd017e5fa5667aa Mon Sep 17 00:00:00 2001 From: status102 <102887808+status102@users.noreply.github.com> Date: Fri, 15 Mar 2024 16:46:49 +0800 Subject: [PATCH] =?UTF-8?q?ci:=20=E4=BF=AE=E6=94=B9=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E7=94=9F=E6=88=90changelog=E4=B8=8E=E4=B8=8A=E4=B8=AAtag?= =?UTF-8?q?=E5=AF=B9=E6=AF=94=EF=BC=8C=E8=80=8C=E9=9D=9E=E4=B8=8E=E4=B8=8A?= =?UTF-8?q?=E4=B8=AA=E5=85=AC=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release-nightly-ota.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-nightly-ota.yml b/.github/workflows/release-nightly-ota.yml index 4ce6980e7e..769b619d79 100644 --- a/.github/workflows/release-nightly-ota.yml +++ b/.github/workflows/release-nightly-ota.yml @@ -93,7 +93,10 @@ jobs: - name: Generate Changelog id: generate_changelog run: | - $content=$(git log --pretty=format:"%s @%an" ${{ steps.set_tag.outputs.pre_version }}..alpha/${{ steps.set_tag.outputs.tag }}) + # pre_version是上一个公版，这里需要拉上一个tag，避免堆积过多commit + latest_tag=$(git describe --tags --abbrev=0) + content=$(git log --pretty=format:"%s    @%an" $latest_tag..alpha/${{ steps.set_tag.outputs.tag }}) + content=%content:\n=\n\n% echo "changelog=$content" >> $env:GITHUB_OUTPUT echo $content @@ -241,7 +244,7 @@ jobs: run: | pre_version=${{ needs.build-win-nightly.outputs.pre_version }} cur_version=${{ needs.build-win-nightly.outputs.main_tag_name }} - echo -e "${{ inputs.release_body || '' }}\n\n${{ needs.build-win-nightly.outputs.changelog }}\n\n**Full Changelog**: [$pre_version -> $cur_version](https://github.com/$GITHUB_REPOSITORY/compare/$pre_version...$cur_version)" > alpha_changelog.md + echo -e "${{ inputs.release_body || '' }}\n\n\n\n${{ needs.build-win-nightly.outputs.changelog }}\n\n**Full Changelog**: [$pre_version -> $cur_version](https://github.com/$GITHUB_REPOSITORY/compare/$pre_version...$cur_version)" > alpha_changelog.md export r=$(cat alpha_changelog.md) # https://github.com/svenstaro/upload-release-action