diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5ff3323..791648c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,3 +1,5 @@ +# Author: Kang Lin + name: build env: @@ -7,6 +9,7 @@ env: on: push: + pull_request: jobs: ubuntu: @@ -25,9 +28,9 @@ jobs: uses: ./.github/workflows/android.yml deploy: + if: ${{ startsWith(github.ref, 'refs/tags/') }} runs-on: ubuntu-latest needs: [ubuntu, msvc, macos, android] - if: ${{ startsWith(github.ref, 'refs/tags/') }} steps: - name: Checkout Repository uses: actions/checkout@v3 @@ -58,24 +61,25 @@ jobs: name: ${{ needs.android.outputs.name }} path: ${{ env.artifact_path }} - - name: Make note file + - name: Make Note.md file run: | cd ${{ env.artifact_path }} - echo "[:cn: 修改日志](https://github.com/KangLin/Calendar/blob/${{env.Calendar_VERSION}}/ChangeLog_zh_CN.md)" > ${{github.workspace}}/Release.md - echo "[:en: Change log](https://github.com/KangLin/Calendar/blob/${{env.Calendar_VERSION}}/ChangeLog.md)" >> ${{github.workspace}}/Release.md - echo "" >> ${{github.workspace}}/Release.md - echo "文件签名:" >> ${{github.workspace}}/Release.md + echo "[:cn: 修改日志](https://github.com/KangLin/Calendar/blob/${{env.Calendar_VERSION}}/ChangeLog_zh_CN.md)" > ${{github.workspace}}/Note.md + echo "[:us: Change log](https://github.com/KangLin/Calendar/blob/${{env.Calendar_VERSION}}/ChangeLog.md)" >> ${{github.workspace}}/Note.md + echo "" >> ${{github.workspace}}/Note.md + echo "文件签名:" >> ${{github.workspace}}/Note.md for file in * do - echo $file - if [ -f $file ]; then + #echo $file + if [ -f $file ] && [ "${file##*.}" != "xml" ]; then + #echo "md5sum $file" md5sum $file > $file.md5sum - cat $file.md5sum >> ${{github.workspace}}/Release.md + cat $file.md5sum >> ${{github.workspace}}/Note.md fi done - name: Upload To Github Release + #if: ${{ startsWith(github.ref, 'refs/tags/') }} run: | - gh release create ${{ github.ref_name }} --title ${{ github.ref_name }} --notes-file ${{github.workspace}}/Release.md - gh release upload ${{ github.ref_name }} ${{github.workspace}}/${{ env.artifact_path }}/* - gh release upload ${{ github.ref_name }} ${{github.workspace}}/Release.md + gh release create ${{ github.ref_name }} --title ${{ github.ref_name }} --notes-file ${{github.workspace}}/Note.md + gh release upload ${{ github.ref_name }} ${{github.workspace}}/${{ env.artifact_path }}/* ${{github.workspace}}/Note.md diff --git a/3th_libs/LunarCalendar b/3th_libs/LunarCalendar index abd3c5f..a70eb1e 160000 --- a/3th_libs/LunarCalendar +++ b/3th_libs/LunarCalendar @@ -1 +1 @@ -Subproject commit abd3c5f836af4cc6d35ce5d070d3e7822d6559ad +Subproject commit a70eb1eb8dfb966b9c063f4af2cfe42dc45b796f