Unverified Commit 9f8cf26f authored by wukongdaily's avatar wukongdaily Committed by GitHub
Browse files

修改重命名的逻辑

parent 2bad31f0
......@@ -188,6 +188,7 @@ jobs:
if: ${{ github.event.inputs.skip_imagebuilder == 'true' }}
run: |
echo "📦 正在下载预构建 rootfs"
echo "PREBUILT_LUCI_VERSION=24.10.2" >> $GITHUB_ENV
mkdir -p bin/targets/armsr/armv8
curl -L -o bin/targets/armsr/armv8/openwrt-armvirt-64-default-rootfs.tar.gz \
https://github.com/wukongdaily/AutoBuildImmortalWrt/releases/download/rootfs/immortalwrt-24.10.2-armsr-armv8-generic-rootfs.tar.gz
......@@ -221,7 +222,14 @@ jobs:
FILENAME=$(basename "$FILE")
echo "FILENAME=$FILENAME" >> $GITHUB_ENV
KERNEL_VERSION=$(echo "$FILENAME" | grep -oP 'k\d+\.\d+\.\d+')
mv "$FILE" "${{ env.PACKAGED_OUTPUTPATH }}/immortalwrt-24.10.2-phicomm-n1-btrfs-$KERNEL_VERSION.img.gz"
LUCI_VERSION="${{ github.event.inputs.luci_version }}"
if [ -n "$PREBUILT_LUCI_VERSION" ]; then
echo "PREBUILT_LUCI_VERSION is not empty: $PREBUILT_LUCI_VERSION"
mv "$FILE" "${{ env.PACKAGED_OUTPUTPATH }}/immortalwrt-$PREBUILT_LUCI_VERSION-phicomm-n1-btrfs-$KERNEL_VERSION.img.gz"
else
mv "$FILE" "${{ env.PACKAGED_OUTPUTPATH }}/immortalwrt-$LUCI_VERSION-phicomm-n1-btrfs-$KERNEL_VERSION.img.gz"
fi
- name: Upload firmware to GitHub Releases
......
......@@ -281,6 +281,7 @@ jobs:
if: ${{ github.event.inputs.skip_imagebuilder == 'true' }}
run: |
echo "📦 正在下载预构建 rootfs"
echo "PREBUILT_LUCI_VERSION=24.10.2" >> $GITHUB_ENV
mkdir -p bin/targets/armsr/armv8
curl -L -o bin/targets/armsr/armv8/openwrt-armvirt-64-default-rootfs.tar.gz \
https://github.com/wukongdaily/AutoBuildImmortalWrt/releases/download/rootfs/immortalwrt-24.10.2-armsr-armv8-generic-rootfs.tar.gz
......@@ -311,6 +312,8 @@ jobs:
id: rename
run: |
MODEL=${{ inputs.openwrt_board }}
LUCI_VERSION="${{ github.event.inputs.luci_version }}"
for FILE in ${{ env.PACKAGED_OUTPUTPATH }}/*.img.gz; do
echo "Processing file: $FILE"
FILENAME=$(basename "$FILE")
......@@ -319,7 +322,14 @@ jobs:
echo "Skipped: Could not extract kernel version from $FILENAME"
continue
fi
NEW_NAME="immortalwrt-24.10.2-$MODEL-btrfs-$KERNEL_VERSION.img.gz"
if [ -n "$PREBUILT_LUCI_VERSION" ]; then
echo "PREBUILT_LUCI_VERSION is not empty: $PREBUILT_LUCI_VERSION"
NEW_NAME="immortalwrt-${PREBUILT_LUCI_VERSION}-${MODEL}-btrfs-${KERNEL_VERSION}.img.gz"
else
NEW_NAME="immortalwrt-${LUCI_VERSION}-${MODEL}-btrfs-${KERNEL_VERSION}.img.gz"
fi
mv "$FILE" "${{ env.PACKAGED_OUTPUTPATH }}/$NEW_NAME"
echo "Renamed to: $NEW_NAME"
done
......
......@@ -139,6 +139,7 @@ jobs:
if: ${{ github.event.inputs.skip_imagebuilder == 'true' }}
run: |
echo "📦 正在下载预构建 rootfs"
echo "PREBUILT_LUCI_VERSION=24.10.2" >> $GITHUB_ENV
mkdir -p bin/targets/armsr/armv8
curl -L -o bin/targets/armsr/armv8/openwrt-armvirt-64-default-rootfs.tar.gz \
https://github.com/wukongdaily/AutoBuildImmortalWrt/releases/download/rootfs/immortalwrt-24.10.2-armsr-armv8-generic-rootfs.tar.gz
......@@ -174,7 +175,13 @@ jobs:
echo "FILENAME=$FILENAME" >> $GITHUB_ENV
KERNEL_VERSION=$(echo "$FILENAME" | grep -oP 'k\d+\.\d+\.\d+')
MODEL=${{ inputs.openwrt_soc }}
mv "$FILE" "${{ env.PACKAGED_OUTPUTPATH }}/immortalwrt-24.10.2-$MODEL-btrfs-$KERNEL_VERSION.img.gz"
if [ -n "$PREBUILT_LUCI_VERSION" ]; then
echo "PREBUILT_LUCI_VERSION is not empty: $PREBUILT_LUCI_VERSION"
mv "$FILE" "${{ env.PACKAGED_OUTPUTPATH }}/immortalwrt-$PREBUILT_LUCI_VERSION-$MODEL-btrfs-$KERNEL_VERSION.img.gz"
else
LUCI_VERSION="${{ github.event.inputs.luci_version }}"
mv "$FILE" "${{ env.PACKAGED_OUTPUTPATH }}/immortalwrt-$LUCI_VERSION-$MODEL-btrfs-$KERNEL_VERSION.img.gz"
fi
- name: Upload firmware to GitHub Releases
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment