工作流：修复非x86_64下错误的包版本对比名称

chenmozhijin · Jul 27, 2023 · e16b6d6 · e16b6d6
1 parent 1f0cf0e
commit e16b6d6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/.github/action/planning/action.yml b/.github/action/planning/action.yml
@@ -35,11 +35,12 @@ runs:
               git checkout $OPENWRT_TAG_BRANCH
               cat $GITHUB_WORKSPACE/config/$i/target.config >> $GITHUB_WORKSPACE/openwrt/.config
               make defconfig
-              target=$(sed -n '/CONFIG_TARGET_BOARD/p' $GITHUB_WORKSPACE/openwrt/.config | sed -e 's/CONFIG_TARGET_BOARD\=\"//' -e 's/\"//')
-              subtarget=$(sed -n '/CONFIG_TARGET_SUBTARGET/p' $GITHUB_WORKSPACE/openwrt/.config | sed -e 's/CONFIG_TARGET_SUBTARGET\=\"//' -e 's/\"//')
-              export parameter=$parameter\{\'config\':\'$i\',\'target\':\'$target\',\'subtarget\':\'$subtarget\'\},
-              echo "::notice ::配置$i的Release名：OpenWrt-K_V$starttime ($target-$subtarget)-[$OPENWRT_TAG_BRANCH]"
-              echo "::notice ::配置$i编译的架构为$target，子架构为$subtarget"
+              target=$(sed -n '/^CONFIG_TARGET_BOARD/p' $GITHUB_WORKSPACE/openwrt/.config | sed -e 's/CONFIG_TARGET_BOARD\=\"//' -e 's/\"//')
+              subtarget=$(sed -n '/^CONFIG_TARGET_SUBTARGET/p' $GITHUB_WORKSPACE/openwrt/.config | sed -e 's/CONFIG_TARGET_SUBTARGET\=\"//' -e 's/\"//')
+              targetarchpackages=$(sed -n '/^CONFIG_TARGET_ARCH_PACKAGES/p' $GITHUB_WORKSPACE/openwrt/.config | sed -e 's/CONFIG_TARGET_ARCH_PACKAGES\=\"//' -e 's/\"//')
+              export parameter=$parameter\{\'config\':\'$i\',\'target\':\'$target\',\'subtarget\':\'$subtarget\',\'targetarchpackages\':\'$targetarchpackages\'\},
+              echo "::notice ::配置$i的Release名: OpenWrt-K_V$starttime ($target-$subtarget)-[$OPENWRT_TAG_BRANCH]"
+              echo "::notice ::配置$i编译的架构为$target,子架构为$subtarget,软件包目标架构为:$targetarchpackages"
               echo "::notice ::配置$i编译的标签/分支为$OPENWRT_TAG_BRANCH"
               echo "v$starttime($target-$subtarget)-($OPENWRT_TAG_BRANCH)" >> $TMPFILE
               rm -rf $GITHUB_WORKSPACE/openwrt

diff --git a/.github/workflows/build-openwrt.yml b/.github/workflows/build-openwrt.yml
@@ -1314,7 +1314,7 @@ jobs:
           mv kmod newkmod
           cp -rf newkmod/* newpackage/
           ls $PACKAGECOMPARE_ROOT_PATH/newpackage/|sort| uniq >newpackage.list
-          sed -i -e "s/_${{ matrix.target }}_${{ matrix.subtarget }}.ipk//g" -e "s/_all.ipk//g" newpackage.list && echo "list complete"
+          sed -i -e "s/_${{ matrix.targetarchpackages }}.ipk//g" -e "s/_all.ipk//g" newpackage.list && echo "list complete"
           echo "内核版本: "$(sed -n '/kernel_/p' newpackage.list | sed -e 's/kernel_//') >> $UPLOAD_ROOT_PATH/release.txt
           echo "包更改/版本升级列表" >> $UPLOAD_ROOT_PATH/release.txt
           diff oldpackage.list newpackage.list -y -W 80 -B -b |grep -E '[\|><]' >diff.temp && echo "Compare complete" || echo "没有包新增删除或版本升级" >> $UPLOAD_ROOT_PATH/release.txt