Skip to content

GitLab

Unverified Commit 331419aa authored by wukongdaily's avatar wukongdaily Committed by GitHub
Browse files

UI 上增加luci版本的可选项24.10.3 

UI 上增加luci版本的可选项24.10.3
parents 41f09215 9f8cf26f
Hide whitespace changes
Inline Side-by-side
Showing with 153 additions and 28 deletions
.github/workflows/build-N1.yml
View file @ 331419aa
......@@ -2,6 +2,16 @@ name: build-N1
on:
workflow_dispatch:
inputs:
luci_version:
description: "选择luci版本"
required: false
default: "24.10.3"
type: choice
options:
- 24.10.0
- 24.10.1
- 24.10.2
- 24.10.3
openwrt_kernel:
description: "选择构建的内核(斐讯N1)"
required: false
......@@ -152,6 +162,7 @@ jobs:
profiles="generic"
include_docker="${{ github.event.inputs.include_docker }}"
rootfs_partsize="${{ github.event.inputs.rootfs_partsize }}"
luci_version="${{ github.event.inputs.luci_version }}"
IFS=',' read -r -a profile_array <<< "$profiles"
......@@ -170,13 +181,14 @@ jobs:
-e PROFILE=$profile \
-e INCLUDE_DOCKER=$include_docker \
-e ROOTFS_PARTSIZE=$rootfs_partsize \
immortalwrt/imagebuilder:armsr-armv8-openwrt-24.10.2 /bin/bash /home/build/immortalwrt/build.sh
immortalwrt/imagebuilder:armsr-armv8-openwrt-${luci_version} /bin/bash /home/build/immortalwrt/build.sh
done
- name: Download prebuilt rootfs.tar.gz
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
......@@ -210,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
......
.github/workflows/build-QEMU-arm64-24.10.2.yml
View file @ 331419aa
......@@ -7,6 +7,16 @@ name: build-QEMU-armsr-armv8-24.10.2
on:
workflow_dispatch:
inputs:
luci_version:
description: "选择luci版本"
required: false
default: "24.10.3"
type: choice
options:
- 24.10.0
- 24.10.1
- 24.10.2
- 24.10.3
profile:
type: choice
description: |
......@@ -72,6 +82,7 @@ jobs:
run: |
profiles="${{ github.event.inputs.profile }}"
rootfs_partsize="${{ github.event.inputs.rootfs_partsize }}"
luci_version="${{ github.event.inputs.luci_version }}"
IFS=',' read -r -a profile_array <<< "$profiles"
......@@ -91,7 +102,7 @@ jobs:
-e ENABLE_PPPOE=${{ inputs.enable_pppoe }} \
-e PPPOE_ACCOUNT=${{ inputs.pppoe_account }} \
-e PPPOE_PASSWORD=${{ inputs.pppoe_password }} \
immortalwrt/imagebuilder:armsr-armv8-openwrt-24.10.2 /bin/bash /home/build/immortalwrt/build.sh
immortalwrt/imagebuilder:armsr-armv8-openwrt-${luci_version} /bin/bash /home/build/immortalwrt/build.sh
done
- name: Generate Firmware SHA-256
run: |
......
.github/workflows/build-RaspBerryPi-24.10.2.yml
View file @ 331419aa
......@@ -14,6 +14,16 @@ on:
- rpi-4
- rpi-5
default: rpi-4
luci_version:
description: "选择luci版本"
required: false
default: "24.10.3"
type: choice
options:
- 24.10.0
- 24.10.1
- 24.10.2
- 24.10.3
enable_store:
description: "集成 store 商店"
required: false
......@@ -58,25 +68,27 @@ jobs:
- name: Build raspberrypi ImmortalWrt 24.10.2
run: |
luci_version="${{ github.event.inputs.luci_version }}"
profiles="${{ github.event.inputs.profile }}"
if [ "$profiles" = "rpi" ]; then
tag=bcm27xx-bcm2708-openwrt-24.10.2
tag=bcm27xx-bcm2708-openwrt-${luci_version}
echo "cpu=bcm2708" >> $GITHUB_ENV
elif [ "$profiles" = "rpi-2" ]; then
tag=bcm27xx-bcm2709-openwrt-24.10.2
tag=bcm27xx-bcm2709-openwrt-${luci_version}
echo "cpu=bcm2709" >> $GITHUB_ENV
elif [ "$profiles" = "rpi-3" ]; then
tag=bcm27xx-bcm2710-openwrt-24.10.2
tag=bcm27xx-bcm2710-openwrt-${luci_version}
echo "cpu=bcm2710" >> $GITHUB_ENV
elif [ "$profiles" = "rpi-4" ]; then
tag=bcm27xx-bcm2711-openwrt-24.10.2
tag=bcm27xx-bcm2711-openwrt-${luci_version}
echo "cpu=bcm2711" >> $GITHUB_ENV
elif [ "$profiles" = "rpi-5" ]; then
tag=bcm27xx-bcm2712-openwrt-24.10.2
tag=bcm27xx-bcm2712-openwrt-${luci_version}
echo "cpu=bcm2712" >> $GITHUB_ENV
fi
include_docker="${{ github.event.inputs.include_docker }}"
size="${{ github.event.inputs.size }}"
IFS=',' read -r -a profile_array <<< "$profiles"
for profile in "${profile_array[@]}"; do
echo "Building for profile: $profile"
......
.github/workflows/build-boxs-by-ophub.yml
View file @ 331419aa
......@@ -2,6 +2,16 @@ name: Build boxs by ophub
on:
workflow_dispatch:
inputs:
luci_version:
description: "选择luci版本"
required: false
default: "24.10.3"
type: choice
options:
- 24.10.0
- 24.10.1
- 24.10.2
- 24.10.3
openwrt_kernel:
description: "选择构建的内核 当高版本内核没有时 系统会自动挑选匹配的内核。比如radxa e52c 即便你选择了6.1.y 可能最终构建还是5.10.160"
required: false
......@@ -245,6 +255,7 @@ jobs:
profiles="generic"
include_docker="${{ github.event.inputs.include_docker }}"
rootfs_partsize="${{ github.event.inputs.rootfs_partsize }}"
luci_version="${{ github.event.inputs.luci_version }}"
IFS=',' read -r -a profile_array <<< "$profiles"
......@@ -263,13 +274,14 @@ jobs:
-e PROFILE=$profile \
-e INCLUDE_DOCKER=$include_docker \
-e ROOTFS_PARTSIZE=$rootfs_partsize \
immortalwrt/imagebuilder:armsr-armv8-openwrt-24.10.2 /bin/bash /home/build/immortalwrt/build.sh
immortalwrt/imagebuilder:armsr-armv8-openwrt-${luci_version} /bin/bash /home/build/immortalwrt/build.sh
done
- name: Download prebuilt rootfs.tar.gz
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
......@@ -300,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")
......@@ -308,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
......
.github/workflows/build-dev-board-by-flippy.yml
View file @ 331419aa
......@@ -2,6 +2,16 @@ name: Build Dev Board Firmware(Flippy)
on:
workflow_dispatch:
inputs:
luci_version:
description: "选择luci版本"
required: false
default: "24.10.3"
type: choice
options:
- 24.10.0
- 24.10.1
- 24.10.2
- 24.10.3
openwrt_kernel:
description: "选择构建的内核 当高版本内核没有时 系统会自动挑选匹配的内核。比如radxa e52c 即便你选择了6.1.y 可能最终构建还是5.10.160"
required: false
......@@ -103,6 +113,7 @@ jobs:
profiles="generic"
include_docker="${{ github.event.inputs.include_docker }}"
rootfs_partsize="${{ github.event.inputs.rootfs_partsize }}"
luci_version="${{ github.event.inputs.luci_version }}"
IFS=',' read -r -a profile_array <<< "$profiles"
......@@ -121,13 +132,14 @@ jobs:
-e PROFILE=$profile \
-e INCLUDE_DOCKER=$include_docker \
-e ROOTFS_PARTSIZE=$rootfs_partsize \
immortalwrt/imagebuilder:armsr-armv8-openwrt-24.10.2 /bin/bash /home/build/immortalwrt/build.sh
immortalwrt/imagebuilder:armsr-armv8-openwrt-${luci_version} /bin/bash /home/build/immortalwrt/build.sh
done
- name: Download prebuilt rootfs.tar.gz
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
......@@ -163,8 +175,14 @@ 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
uses: softprops/action-gh-release@v2.2.1
......
.github/workflows/build-iso.yml
View file @ 331419aa
......@@ -8,6 +8,16 @@ name: build ISO
on:
workflow_dispatch:
inputs:
luci_version:
description: "选择luci版本"
required: false
default: "24.10.3"
type: choice
options:
- 24.10.0
- 24.10.1
- 24.10.2
- 24.10.3
profile:
description: '请输入要编译固件大小 单位(MB)'
required: true
......@@ -73,6 +83,7 @@ jobs:
run: |
profiles="${{ github.event.inputs.profile }}"
include_docker="${{ github.event.inputs.include_docker }}"
luci_version="${{ github.event.inputs.luci_version }}"
IFS=',' read -r -a profile_array <<< "$profiles"
for profile in "${profile_array[@]}"; do
......@@ -89,7 +100,7 @@ jobs:
-e ENABLE_PPPOE=${{ inputs.enable_pppoe }} \
-e PPPOE_ACCOUNT=${{ inputs.pppoe_account }} \
-e PPPOE_PASSWORD=${{ inputs.pppoe_password }} \
immortalwrt/imagebuilder:x86-64-openwrt-24.10.2 /bin/bash /home/build/immortalwrt/build.sh
immortalwrt/imagebuilder:x86-64-openwrt-${luci_version} /bin/bash /home/build/immortalwrt/build.sh
done
- name: ✅ 复制固件到根目录
......
.github/workflows/build-rockchip-immortalWrt-24.10.2.yml
View file @ 331419aa
......@@ -3,6 +3,16 @@ name: build-rockchip-immortalWrt-24.10.2
on:
workflow_dispatch:
inputs:
luci_version:
description: "选择luci版本"
required: false
default: "24.10.3"
type: choice
options:
- 24.10.0
- 24.10.1
- 24.10.2
- 24.10.3
profile:
type: choice
description: |
......@@ -132,6 +142,7 @@ jobs:
profiles="${{ github.event.inputs.profile }}"
include_docker="${{ github.event.inputs.include_docker }}"
rootfs_partsize="${{ github.event.inputs.rootfs_partsize }}"
luci_version="${{ github.event.inputs.luci_version }}"
IFS=',' read -r -a profile_array <<< "$profiles"
......@@ -152,7 +163,7 @@ jobs:
-e ENABLE_PPPOE=${{ inputs.enable_pppoe }} \
-e PPPOE_ACCOUNT=${{ inputs.pppoe_account }} \
-e PPPOE_PASSWORD=${{ inputs.pppoe_password }} \
immortalwrt/imagebuilder:rockchip-armv8-openwrt-24.10.2 /bin/bash /home/build/immortalwrt/build.sh
immortalwrt/imagebuilder:rockchip-armv8-openwrt-${luci_version} /bin/bash /home/build/immortalwrt/build.sh
done
- name: Create info
......
.github/workflows/build-sunxi-cortexa53-24.10.2.yml
View file @ 331419aa
......@@ -5,7 +5,7 @@ on:
inputs:
profile:
type: choice
description: "请选择路由器型号"
description: "请选择开发板型号"
required: true
options:
- xunlong_orangepi-zero3
......@@ -19,6 +19,16 @@ on:
- pine64_pine64-plus
- pine64_sopine-baseboard
default: xunlong_orangepi-zero3
luci_version:
description: "选择luci版本"
required: false
default: "24.10.3"
type: choice
options:
- 24.10.0
- 24.10.1
- 24.10.2
- 24.10.3
enable_store:
description: "集成 store 商店"
required: false
......@@ -65,6 +75,7 @@ jobs:
profiles="${{ github.event.inputs.profile }}"
include_docker="${{ github.event.inputs.include_docker }}"
size="${{ github.event.inputs.size }}"
luci_version="${{ github.event.inputs.luci_version }}"
IFS=',' read -r -a profile_array <<< "$profiles"
......@@ -81,7 +92,7 @@ jobs:
-e PROFILE=$profile \
-e INCLUDE_DOCKER=$include_docker \
-e ROOTSIZE=$size \
immortalwrt/imagebuilder:sunxi-cortexa53-openwrt-24.10.2 /bin/bash /home/build/immortalwrt/build.sh
immortalwrt/imagebuilder:sunxi-cortexa53-openwrt-${luci_version} /bin/bash /home/build/immortalwrt/build.sh
done
......
.github/workflows/build-wireless-router.yml
View file @ 331419aa
......@@ -10,8 +10,8 @@
# jcg_q30-ubootmod
# qihoo_360t7-ubootmod
# xiaomi_mi-router-wr30u-112m-nmbm
# xiaomi_redmi-router-ax6000 该机型在24.10.2 分化为2个机型
# —————————————————————————————24.10.2—————————————————————————————————
# xiaomi_redmi-router-ax6000 该机型在24.10.3 分化为2个机型
# —————————————————————————————24.10.3—————————————————————————————————
# xiaomi_redmi-router-ax6000-stock ————原厂默认 bootloader（stock）版本
# xiaomi_redmi-router-ax6000-ubootmod—————改装过 bootloader 的版本（ubootmod）
......@@ -558,7 +558,7 @@ jobs:
fi
- name: Build Wireless ImmortalWrt 24.10.2
- name: Build Wireless ImmortalWrt
run: |
profile="${{ github.event.inputs.profile }}"
echo "Building for profile: $profile"
......@@ -570,7 +570,7 @@ jobs:
ipq807x_models=$(cat model/ipq807x.txt | tr '\n' '|')
ipq807x_models=${ipq807x_models%|}
if [[ "$profile" =~ ^($ipq807x_models)$ ]]; then
case_tag="qualcommax-ipq807x-openwrt-24.10.2"
case_tag="qualcommax-ipq807x-openwrt-24.10.3"
case_platform="qualcommax/ipq807x"
fi
......@@ -578,7 +578,7 @@ jobs:
mt7621_models=$(cat model/mt7621.txt | tr '\n' '|')
mt7621_models=${mt7621_models%|}
if [[ "$profile" =~ ^($mt7621_models)$ ]]; then
case_tag="ramips-mt7621-openwrt-24.10.2"
case_tag="ramips-mt7621-openwrt-24.10.3"
case_platform="ramips/mt7621"
fi
......@@ -586,7 +586,7 @@ jobs:
bcm53xx_models=$(cat model/bcm53xx.txt | tr '\n' '|')
bcm53xx_models=${bcm53xx_models%|}
if [[ "$profile" =~ ^($bcm53xx_models)$ ]]; then
case_tag="bcm53xx-generic-openwrt-24.10.2"
case_tag="bcm53xx-generic-openwrt-24.10.3"
case_platform="bcm53xx/generic"
fi
......@@ -594,7 +594,7 @@ jobs:
case "$profile" in
glinet_gl-b2200)
# 虽然它是高通ipq40xx平台 但由于都是gl机型 故放在一起 找起来方便
tag=ipq40xx-generic-openwrt-24.10.2
tag=ipq40xx-generic-openwrt-24.10.3
echo "platform=ipq40xx/generic" >> $GITHUB_ENV
;;
glinet_gl-axt1800|glinet_gl-ax1800)
......@@ -603,11 +603,11 @@ jobs:
echo "platform=qualcommax/ipq60xx" >> $GITHUB_ENV
;;
cudy_tr3000-256mb-v1)
# 由于256MB版本tr3000 还没有出正式版24.10.2 故使用快照版本来构建
# 由于256MB版本tr3000 还没有出正式版24.10.3 故使用快照版本来构建
tag=mediatek-filogic-24.10-SNAPSHOT
;;
xiaomi_redmi-router-ax6s)
tag=mediatek-mt7622-openwrt-24.10.2
tag=mediatek-mt7622-openwrt-24.10.3
echo "platform=mediatek/mt7622" >> $GITHUB_ENV
;;
# 下列机型目前没有24.10 因此采用23.05.4分支来构建
......@@ -633,7 +633,7 @@ jobs:
echo "platform=$case_platform" >> $GITHUB_ENV
else
# 默认分支
tag=mediatek-filogic-openwrt-24.10.2
tag=mediatek-filogic-openwrt-24.10.3
fi
;;
esac
......
.github/workflows/build-x86-64-24.10.2.yml
View file @ 331419aa
......@@ -3,6 +3,16 @@ name: build-x86-64-immortalwrt-24.10.2
on:
workflow_dispatch:
inputs:
luci_version:
description: "选择luci版本"
required: false
default: "24.10.3"
type: choice
options:
- 24.10.0
- 24.10.1
- 24.10.2
- 24.10.3
custom_router_ip:
description: "请设置路由器的管理地址(仅对多网口路由器有效) 格式:192.168.x.1 或 10.x.x.1"
required: true
......@@ -80,6 +90,7 @@ jobs:
run: |
profile="${{ github.event.inputs.profile }}"
include_docker="${{ github.event.inputs.include_docker }}"
luci_version="${{ github.event.inputs.luci_version }}"
echo "Building for profile: $profile"
docker run --rm -i \
--user root \
......@@ -94,7 +105,7 @@ jobs:
-e ENABLE_PPPOE=${{ inputs.enable_pppoe }} \
-e PPPOE_ACCOUNT=${{ inputs.pppoe_account }} \
-e PPPOE_PASSWORD=${{ inputs.pppoe_password }} \
immortalwrt/imagebuilder:x86-64-openwrt-24.10.2 /bin/bash /home/build/immortalwrt/build.sh
immortalwrt/imagebuilder:x86-64-openwrt-${luci_version} /bin/bash /home/build/immortalwrt/build.sh
- name: Create info
......
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