diff --git a/.github/workflows/macos-homebrew-xapian.yml b/.github/workflows/macos-homebrew-xapian.yml index c4c7e02a..304c8d3c 100644 --- a/.github/workflows/macos-homebrew-xapian.yml +++ b/.github/workflows/macos-homebrew-xapian.yml @@ -134,8 +134,11 @@ jobs: echo "::set-output name=release_time::$(date +'%H%M%S')" echo "::set-output name=release_time_clock::$(date +'%H:%M:%S')" echo "::set-output name=release_hm::$(date +'%y%m%d')" - + # tag 上传Release + - name: "Build Changelog" + id: build_changelog + uses: mikepenz/release-changelog-builder-action@{latest-release} - name: uploadRelease uses: svenstaro/upload-release-action@v2 with: @@ -143,7 +146,7 @@ jobs: file: ${{ env.targetName }}.dmg asset_name: ${{ matrix.qt_ver }}-${{ env.targetName }}_${{ matrix.os }}_homebrew_${{steps.vars.outputs.release_date}}.dmg tag: v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }} - overwrite: true + overwrite: true release_name: GoldenDict-ng-v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }} prerelease: ${{env.prerelease}} body: | @@ -174,3 +177,4 @@ jobs: CHANGES: ${{ steps.changelog.outputs.changelog }} + ${{steps.build_changelog.outputs.changelog}} diff --git a/.github/workflows/ubuntu-6.2-xapian.yml b/.github/workflows/ubuntu-6.2-xapian.yml index c5eb38d1..0a602405 100644 --- a/.github/workflows/ubuntu-6.2-xapian.yml +++ b/.github/workflows/ubuntu-6.2-xapian.yml @@ -33,7 +33,7 @@ jobs: version: 23.06.02 version-suffix: alpha prerelease: true - steps: + steps: - name: Install Qt uses: jurplel/install-qt-action@v3 with: @@ -120,7 +120,10 @@ jobs: echo "::set-output name=release_time_clock::$(date +'%H:%M:%S')" echo "::set-output name=release_hm::$(date +'%y%m%d')" echo "::set-output name=appname::$(ls *.AppImage*)" - + + - name: "Build Changelog" + id: build_changelog + uses: mikepenz/release-changelog-builder-action@{latest-release} - name: uploadRelease # if: startsWith(github.event.ref, 'refs/tags/') uses: svenstaro/upload-release-action@v2 @@ -129,7 +132,7 @@ jobs: file: ${{ steps.vars.outputs.appname }} asset_name: ${{ matrix.qt_ver }}-${{ steps.vars.outputs.appname }} tag: v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }} - overwrite: true + overwrite: true release_name: GoldenDict-ng-v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }} prerelease: ${{env.prerelease}} body: | @@ -160,3 +163,4 @@ jobs: CHANGES: ${{ steps.changelog.outputs.changelog }} + ${{steps.build_changelog.outputs.changelog}} diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 362c4a22..e6e10407 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -109,16 +109,19 @@ jobs: echo "::set-output name=release_time_clock::$(date +'%H:%M:%S')" echo "::set-output name=release_hm::$(date +'%y%m%d')" echo "::set-output name=appname::$(ls *.AppImage*)" - + + - name: "Build Changelog" + id: build_changelog + uses: mikepenz/release-changelog-builder-action@{latest-release} - name: uploadRelease # if: startsWith(github.event.ref, 'refs/tags/') uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: ${{ steps.vars.outputs.appname }} - asset_name: ${{ matrix.qt_ver }}-${{ env.targetName }}_${{ matrix.os }}_${{steps.vars.outputs.release_date}}.AppImage + asset_name: ${{ matrix.qt_ver }}-${{ steps.vars.outputs.appname }} tag: v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }} - overwrite: true + overwrite: true release_name: GoldenDict-ng-v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }} prerelease: ${{env.prerelease}} body: | @@ -149,3 +152,4 @@ jobs: CHANGES: ${{ steps.changelog.outputs.changelog }} + ${{steps.build_changelog.outputs.changelog}} diff --git a/.github/workflows/windows-6.x-xapian.yml b/.github/workflows/windows-6.x-xapian.yml index 2627b275..66cba9db 100644 --- a/.github/workflows/windows-6.x-xapian.yml +++ b/.github/workflows/windows-6.x-xapian.yml @@ -115,7 +115,7 @@ jobs: # 打包 - name: package - id: package + id: package env: archiveName: GoldenDict-Windows.${{ steps.vars.outputs.sha_short }}-${{ steps.vars.outputs.release_time }} msvcArch: ${{ matrix.msvc_arch }} @@ -124,16 +124,18 @@ jobs: & .github\scripts\windows-publish.ps1 ${env:archiveName} ${env:targetName} $name = ${env:archiveName} echo "::set-output name=packageName::$name" - + - name: "Build Changelog" + id: build_changelog + uses: mikepenz/release-changelog-builder-action@{latest-release} - name: uploadRelease # if: startsWith(github.event.ref, 'refs/tags/') uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: ${{ steps.package.outputs.packageName }}.zip - asset_name: ${{ matrix.qt_ver }}-${{ env.targetName }}_${{ matrix.os }}_${{steps.vars.outputs.release_date}}-xapian.zip + asset_name: ${{ matrix.qt_ver }}-${{ env.targetName }}_${{ matrix.os }}_${{steps.vars.outputs.release_date}}.zip tag: v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }} - overwrite: true + overwrite: true release_name: GoldenDict-ng-v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }} prerelease: ${{env.prerelease}} body: | @@ -161,6 +163,7 @@ jobs: CHANGES: ${{ steps.changelog.outputs.changelog }} + ${{steps.build_changelog.outputs.changelog}} - name: upload goldendict.exe only uses: svenstaro/upload-release-action@v2 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index f98b4a08..a8b8a1e6 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -104,7 +104,7 @@ jobs: # 打包 - name: package - id: package + id: package env: archiveName: GoldenDict-Windows.${{ steps.vars.outputs.sha_short }}-${{ steps.vars.outputs.release_time }} msvcArch: ${{ matrix.msvc_arch }} @@ -114,6 +114,9 @@ jobs: $name = ${env:archiveName} echo "::set-output name=packageName::$name" + - name: "Build Changelog" + id: build_changelog + uses: mikepenz/release-changelog-builder-action@{latest-release} - name: uploadRelease # if: startsWith(github.event.ref, 'refs/tags/') uses: svenstaro/upload-release-action@v2 @@ -122,7 +125,7 @@ jobs: file: ${{ steps.package.outputs.packageName }}.zip asset_name: ${{ matrix.qt_ver }}-${{ env.targetName }}_${{ matrix.os }}_${{steps.vars.outputs.release_date}}.zip tag: v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }} - overwrite: true + overwrite: true release_name: GoldenDict-ng-v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }} prerelease: ${{env.prerelease}} body: | @@ -152,6 +155,7 @@ jobs: CHANGES: ${{ steps.changelog.outputs.changelog }} + ${{steps.build_changelog.outputs.changelog}} - name: upload goldendict.exe only # if: startsWith(github.event.ref, 'refs/tags/') uses: svenstaro/upload-release-action@v2