CI: modify ci

KangLin · Feb 4, 2024 · 0f4d822 · 0f4d822
1 parent 20eb832
commit 0f4d822
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 29 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -18,10 +18,12 @@ jobs:
           - BUILD_TYPE: Release
             qt_arch: android_arm64_v8a
             VCPKG_TARGET_TRIPLET: arm64-android
+            config_arch: arm64_v8a
 
           - BUILD_TYPE: Release
             qt_arch: android_x86_64 
             VCPKG_TARGET_TRIPLET: x64-android
+            config_arch: x86_64
 
     runs-on: ubuntu-latest
 
@@ -132,34 +134,14 @@ jobs:
           APK_FILE=`find . -name "android-*.apk"`
           cp $APK_FILE SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}.apk
 
-      - name: Package
-        if: false
-        env:
-          QT_ROOT: ${{env.Qt5_DIR}}
-          RabbitCommon_DIR: ${{env.SOURCE_DIR}}/RabbitCommon
-          STOREPASS: ${{secrets.STOREPASS}}
+      - name: Update configure file
+        working-directory: ${{github.workspace}}/build
         run: |
-          ${QT_ROOT}/bin/androiddeployqt \
-              --input `pwd`/App/android-libSerialPortAssistant.so-deployment-settings.json \
-              --output `pwd`/android-build \
-              --android-platform ${{matrix.ANDROID_PLATFORM}} \
-              --gradle \
-              --verbose \
-              --sign ${{env.RabbitCommon_DIR}}/RabbitCommon.keystore rabbitcommon \
-              --storepass ${{env.STOREPASS}}
-          APK_FILE=`find . -name "android-build-release-signed.apk"`
-          APK_NAME=SerialPortAssistant_${{matrix.ANDROID_ABI}}_${{env.SerialPortAssistant_VERSION}}.apk
-          mv -f ${APK_FILE} ${APK_NAME}
-          APK_FILE=${APK_NAME}
-          cp ${{github.workspace}}/Update/update_android.xml update_android_${{matrix.ANDROID_ABI}}.xml
-          MD5=`md5sum ${APK_FILE} | awk '{print $1}'`
-          echo "MD5:${MD5}"
-          sed -i "s/<VERSION>.*</<VERSION>${{env.SerialPortAssistant_VERSION}}</g" update_android_${{matrix.ANDROID_ABI}}.xml
-          sed -i "s/<INFO>.*</<INFO>Release SerialPortAssistant ${{env.SerialPortAssistant_VERSION}}</g" update_android_${{matrix.ANDROID_ABI}}.xml
-          sed -i "s/<TIME>.*</<TIME>`date`</g" update_android_${{matrix.ANDROID_ABI}}.xml
-          sed -i "s/<ARCHITECTURE>.*</<ARCHITECTURE>${{matrix.ANDROID_ABI}}</g" update_android_${{matrix.ANDROID_ABI}}.xml
-          sed -i "s/<MD5SUM>.*</<MD5SUM>${MD5}</g" update_android_${{matrix.ANDROID_ABI}}.xml
-          sed -i "s:<URL>.*<:<URL>https\://github.com/KangLin/SerialPortAssistant/releases/download/${{env.SerialPortAssistant_VERSION}}/${APK_NAME}<:g" update_android_${{matrix.ANDROID_ABI}}.xml
+          ${{env.SOURCE_DIR}}/RabbitCommon/Install/SerialPortAssistant.sh \
+            update_android_${{matrix.qt_version}}.json \
+            SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}.apk \
+            android ${{matrix.config_arch}} \
+            "https://github.com/KangLin/Calendar/releases/download/${{env.Calendar_VERSION}}/SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}.apk,https://sourceforge.net/projects/rabbitcalendar/files/${{env.Calendar_VERSION}}/SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}.apk"
 
       - name: update
         if: ${{ matrix.BUILD_TYPE == 'Release' }}
@@ -168,3 +150,4 @@ jobs:
           name: ${{ env.artifact_name }}
           path: |
             ${{github.workspace}}/build/SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}.apk
+            ${{github.workspace}}/build/update_android_${{matrix.qt_version}}.json
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -59,6 +59,29 @@ jobs:
           name: ${{ needs.macos.outputs.name }}
           path: ${{ env.artifact_path }}
 
+      - name: Process configure file
+        run: |
+          echo "\{" > ${{ github.workspace }}/update.json
+          echo "    "version": \{" >> ${{ github.workspace }}/update.json
+          cat ${{ github.workspace }}/version.json >> ${{ github.workspace }}/update.json
+          echo "    \},"
+          echo "    "files":\[" >> ${{ github.workspace }}/update.json
+          cd ${{ env.artifact_path }}
+          index=0
+          for file in `ls *.json`
+          do
+              echo $file
+              if [ $index -gt 0 ]; then
+                  echo "," >> ${{ github.workspace }}/update.json
+              fi
+              cat $file >> ${{ github.workspace }}/update.json
+          done
+          echo "    \]" >> ${{ github.workspace }}/update.json
+          echo "\}" >> ${{ github.workspace }}/update.json
+          echo "cat >> ${{ github.workspace }}/update.json"
+          cat >> ${{ github.workspace }}/update.json
+          rm -fr *.json
+      
       - name: Make note file
         run: |
           echo "[:cn: 修改日志](ChangeLog_zh_CN.md) [:us: Change log](ChangeLog.md)" > ${{github.workspace}}/Release.md

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -103,13 +103,26 @@ jobs:
           cmake --build . --config ${{ matrix.BUILD_TYPE }} --target install
           7z a SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_macos.zip install/.
 
+      - name: Update configure file
+        if: false  #${{ matrix.BUILD_TYPE == 'Release' }}
+        working-directory: ${{github.workspace}}/build
+        run: |
+          ./install/bin/SerialPortAssistant.sh \
+               -f "${{github.workspace}}/update_macos.${{matrix.qt_version}}.json" \
+               --foc 1 \
+               --md5 ${MD5} \
+               -n "SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_macos.zip" \
+               -m "${{env.SerialPortAssistant_VERSION}}" \
+               -u "https://github.com/KangLin/SerialPortAssistant/releases/download/v${{env.SerialPortAssistant_VERSION}}/SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_macos.zip;https://sourceforge.net/projects/rabbitSerialPortAssistant/files/v${{env.SerialPortAssistant_VERSION}}/SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_macos.zip"
+      
       - name: Update artifact
         if: ${{ matrix.BUILD_TYPE == 'Release' }}
         uses: actions/upload-artifact@v3
         with:
           name: ${{ env.artifact_name }}
           path: |
             ${{github.workspace}}/build/SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_macos.zip
+            ${{github.workspace}}/update_macos.${{matrix.qt_version}}.json
 
 #    - name: Upload To Github Release
 #      if: ${{ matrix.BUILD_TYPE == 'Release' && startsWith(github.ref, 'refs/tags/') }}

diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml
@@ -118,7 +118,7 @@ jobs:
 
       - name: Package
         working-directory: ${{github.workspace}}/build
-        if: ${{ matrix.BUILD_TYPE == 'Release' && '6.6.1' == matrix.qt_version }}
+        if: ${{ matrix.BUILD_TYPE == 'Release' }}
         run: |
           cmake --install . --config ${{matrix.BUILD_TYPE}} --component=Application
           cmake --install . --config ${{matrix.BUILD_TYPE}} --component=Runtime
@@ -133,14 +133,26 @@ jobs:
               --pf SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_qt${{matrix.qt_version}}_Setup.exe ^
               -m "${{env.SerialPortAssistant_VERSION}}"
 
+      - name: Update configure file
+        if: ${{ matrix.BUILD_TYPE == 'Release' }}
+        working-directory: ${{github.workspace}}\build
+        run: |
+          .\install\bin\SerialPortAssistant.exe ^
+               -f "${{github.workspace}}\build\update_windows_${{matrix.qt_version}}.json" ^
+               --foc 1 ^
+               --pf ${{github.workspace}}\build\SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_qt${{matrix.qt_version}}_Setup.exe  ^
+               -m "${{env.SerialPortAssistant_VERSION}}" ^
+               -u "https://github.com/KangLin/SerialPortAssistant/releases/download/${{env.SerialPortAssistant_VERSION}}/SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_qt${{matrix.qt_version}}_Setup.exe ;https://sourceforge.net/projects/rabbitSerialPortAssistant/files/${{env.SerialPortAssistant_VERSION}}/SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_qt${{matrix.qt_version}}_Setup.exe "
+      
       - name: Update artifact
-        if: ${{ matrix.BUILD_TYPE == 'Release' && '6.6.1' == matrix.qt_version }}
+        if: ${{ matrix.BUILD_TYPE == 'Release' }}
         uses: actions/upload-artifact@v3
         with:
           name: ${{ env.artifact_name }}
           path: |
             ${{github.workspace}}\build\SerialPortAssistant_Setup_${{env.SerialPortAssistant_VERSION}}.exe
             ${{github.workspace}}\build\update_windows.xml
+            ${{github.workspace}}\build\update_windows_${{matrix.qt_version}}.json
 
 #    - name: Upload To Github Release
 #      if: ${{ matrix.BUILD_TYPE == 'Release' && '5.12.12' == matrix.qt_version && startsWith(github.ref, 'refs/tags/') }}