Merge pull request #149 from wychlw/main

Fix: CI

Author: KevinMX

.github/workflows/package-index-sync.yaml

@@ -41,7 +41,7 @@ jobs:
           echo "Event Name: ${{ github.event_name }}"
           echo "Ref: ${{ github.ref }}"
           echo "Repository Owner: ${{ github.repository_owner }}"
-          echo "Inputs: makepr ${{ inputs.makepr }} debuginfo ${{ inputs.debuginfo }}"
+          echo "Inputs: makepr ${{ inputs.makepr }} debuginfo ${{ inputs.debuginfo }} force ${{ inputs.force }}"
           echo "Should Run Auto: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'ruyisdk' ) }}"
           echo "Should Run Manual: ${{ ( github.event_name == 'workflow_dispatch' ) }}"
   build:
@@ -86,7 +86,7 @@ jobs:
           echo "Generate and PR" > $RUNNER_TEMP/type.txt
           export CI_RUN_ID=${{ github.run_id }}
           export CI_RUN_URL=${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
-          if [[ ${{ inputs.force }} == 'true' ]]; then
+          if [[ ${{ ( github.event_name == 'push' || inputs.force ) }} == 'true' ]]; then
             python assets/renew_ruyi_index.py -c assets/config.toml -p . -i $RUNNER_TEMP/cache --log $RUNNER_TEMP/log.txt --warn $RUNNER_TEMP/warn.txt --pr --force
           else
             python assets/renew_ruyi_index.py -c assets/config.toml -p . -i $RUNNER_TEMP/cache --log $RUNNER_TEMP/log.txt --warn $RUNNER_TEMP/warn.txt --pr --force

assets/src/ruyi_index_updator/upload_plugin/lm4a_revy.py

@@ -131,7 +131,7 @@ def handle_report_uboot_8g(self, vinfo: VInfo,
         if index == "uboot-revyos-sipeed-lpi4a-8g"  \
                 and self.cmp_version(vinfo.version, "20240720") <= 0:
             bname = "u-boot-with-spl-lpi4a"
-        elif index == "uboot-revyos-sipeed-lc4a-8g" \
+        elif index == "uboot-revyos-sipeed-lpi4a-8g" \
                 and self.cmp_version(vinfo.version, "20240720") > 0:
             bname = "u-boot-with-spl-lpi4a-main"
         elif index == "uboot-revyos-sipeed-lc4a-8g":
@@ -192,9 +192,9 @@ def handle_report_uboot_16g(self, vinfo: VInfo,
         if index == "uboot-revyos-sipeed-lpi4a-16g"  \
                 and self.cmp_version(vinfo.version, "20240720") <= 0:
             bname = "u-boot-with-spl-lpi4a-16g"
-        elif index == "uboot-revyos-sipeed-lc4a-16g" \
+        elif index == "uboot-revyos-sipeed-lpi4a-16g" \
                 and self.cmp_version(vinfo.version, "20240720") > 0:
-            bname = "u-boot-with-spl-lpi4a-main-16g"
+            bname = "u-boot-with-spl-lpi4a-16g-main"
         elif index == "uboot-revyos-sipeed-lc4a-16g":
             bname = "u-boot-with-spl-lc4a-16g-main"
         else:  # unreachable

assets/src/ruyi_index_updator/version_diff.py

@@ -8,6 +8,7 @@
 import tempfile
 import hashlib
 import toml
+import traceback
 
 from awesomeversion import AwesomeVersion
 
@@ -151,6 +152,7 @@ def gen_diff(self, filter_plugins: list[str] = None, threadhold=ImageStatus("bas
                 logger.error("Error occurs when handling system %s:%s:%s-%s",
                              v.vendor, v.system, v.variant, v.version)
                 logger.error("Error: %s", e)
+                logger.error(traceback.format_exc())
 
     def __init__(self, matrix: Systems, conf: str):
         self.__get_tmp_path()