CI: modify build.yml

Author: KangLin

.github/workflows/android.yml

@@ -32,7 +32,7 @@ jobs:
     runs-on: ubuntu-24.04
 
     env:
-      Calendar_VERSION: v1.0.20
+      Calendar_VERSION: v1.0.21
       VCPKGGITCOMMITID: 9f5925e81bbcd9c8c34cc7a8bd25e3c557b582b2
       VCPKG_TARGET_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
       VCPKG_DEFAULT_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}

.github/workflows/appimage.yml

@@ -114,7 +114,7 @@ jobs:
           echo "MD5SUM Calendar_${{env.Calendar_VERSION}}_$ARCH.AppImage: ${MD5SUM}"
           echo "Generate update configure file ......"
           ./Calendar_${{env.Calendar_VERSION}}_$ARCH.AppImage \
-            -f "${{github.workspace}}/update_appimage_${{matrix.qt_arch}}_qt${{matrix.qt_version}}.json" \
+            -f "${{github.workspace}}/update_appimage_${{matrix.os}}_${{matrix.qt_arch}}_${{matrix.BUILD_TYPE}}.json" \
             --foc 1 \
             --file-name Calendar_${{env.Calendar_VERSION}}_$ARCH.AppImage \
             -u "https://github.com/KangLin/Calendar/releases/download/${{env.Calendar_VERSION}}/Calendar_${{env.Calendar_VERSION}}_${ARCH}.AppImage;https://sourceforge.net/projects/Calendar/files/${{env.Calendar_VERSION}}/Calendar_${{env.Calendar_VERSION}}_${ARCH}.AppImage" \
@@ -128,4 +128,4 @@ jobs:
           name: ${{ env.artifact_name }}
           path: |
             ${{github.workspace}}/Calendar_${{env.Calendar_VERSION}}_*.AppImage
-            ${{github.workspace}}/update_appimage_${{matrix.qt_arch}}_qt${{matrix.qt_version}}.json
+            ${{github.workspace}}/update_appimage_${{matrix.os}}_${{matrix.qt_arch}}_${{matrix.BUILD_TYPE}}.json

.github/workflows/build.yml

@@ -5,7 +5,7 @@ name: build
 env:
   artifact_path: artifact_path
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  Calendar_VERSION: v1.0.21
+  Calendar_VERSION: v1.0.20
 
 on: 
   push:
@@ -35,7 +35,7 @@ jobs:
   deploy:
     if: ${{ startsWith(github.ref, 'refs/tags/') }}
     runs-on: ubuntu-latest
-    needs: [ubuntu, msvc, macos, android]
+    needs: [ubuntu, appimage, msvc, macos, android]
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v3
@@ -49,6 +49,13 @@ jobs:
           path: ${{ env.artifact_path }}
           merge-multiple: true
 
+      - name: Download appimage
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ needs.appimage.outputs.name }}
+          path: ${{ env.artifact_path }}
+          merge-multiple: true
+
       - name: Download msvc
         uses: actions/download-artifact@v4
         with:
@@ -73,33 +80,37 @@ jobs:
       - name: Process configure file
         run: |
           git clone https://github.com/KangLin/RabbitCommon.git
+          ls
+          echo "ls "${{ github.workspace }}"
+          ls "${{ github.workspace }}
+          echo "ls ${{ env.artifact_path }}"
+          ls ${{ env.artifact_path }}
           ./RabbitCommon/Install/MergeJsonFile.sh \
               "${{ github.workspace }}/update.json" \
               "${{ env.artifact_path }}" "${{ env.artifact_path }}/version.json"
           rm ${{ env.artifact_path }}/*.json
 
       - name: Make note file
         run: |
-          cd ${{ env.artifact_path }}
           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 "File signatures:" >> ${{github.workspace}}/Note.md
+          echo "File checksum:" >> ${{github.workspace}}/Note.md
+          echo "|File|Checksum(md5)|" >> ${{github.workspace}}/Note.md
+          echo "| :- |    :-       |" >> ${{github.workspace}}/Note.md
+          cd ${{ env.artifact_path }}
           for file in *
           do
               echo "$file"
               if [ -f $file ]; then
                   if [ "${file##*.}" != "xml" ] && [ "${file##*.}" != "json" ]; then
-                      md5sum $file > $file.md5sum
-                      cat $file.md5sum >> ${{github.workspace}}/Note.md
+                      md5sum $file > ${file}.md5sum
+                      awk '{print  "|", $2, "|", $1, "|"}' ${file}.md5sum >> ${{github.workspace}}/Note.md
                   fi
               else
                  rm -fr $file
               fi
           done
-          echo "" >> ${{github.workspace}}/Note.md
-#          echo "得到文件签名（在 linux 中）: md5sum file" >> ${{github.workspace}}/Note.md
-#          echo "Get file signatures in linux: md5sum file" >> ${{github.workspace}}/Note.md
 
       - name: Upload To Github Release
         if: ${{ startsWith(github.ref, 'refs/tags/') }}

debian/changelog

@@ -2,4 +2,4 @@ rabbitcalendar (1.0.21) unstable; urgency=medium
 
     * Full Changelog: [v1.0.20..v1.0.21](https://github.com/KangLin/RabbitRemoteControl/compare/v1.0.20..v1.0.21)
 
- -- Kang Lin <[email protected]>  Thu, 13 Feb 2025 16:07:34 +0800
+ -- Kang Lin <[email protected]>  Thu, 13 Feb 2025 16:46:10 +0800