Unverified Commit 2bad31f0 authored by wukongdaily's avatar wukongdaily Committed by GitHub
Browse files

所有工作流增加luci版本的选项

parent d5666c85
...@@ -2,6 +2,16 @@ name: build-N1 ...@@ -2,6 +2,16 @@ name: build-N1
on: on:
workflow_dispatch: workflow_dispatch:
inputs: 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: openwrt_kernel:
description: "选择构建的内核(斐讯N1)" description: "选择构建的内核(斐讯N1)"
required: false required: false
...@@ -152,6 +162,7 @@ jobs: ...@@ -152,6 +162,7 @@ jobs:
profiles="generic" profiles="generic"
include_docker="${{ github.event.inputs.include_docker }}" include_docker="${{ github.event.inputs.include_docker }}"
rootfs_partsize="${{ github.event.inputs.rootfs_partsize }}" rootfs_partsize="${{ github.event.inputs.rootfs_partsize }}"
luci_version="${{ github.event.inputs.luci_version }}"
IFS=',' read -r -a profile_array <<< "$profiles" IFS=',' read -r -a profile_array <<< "$profiles"
...@@ -170,7 +181,7 @@ jobs: ...@@ -170,7 +181,7 @@ jobs:
-e PROFILE=$profile \ -e PROFILE=$profile \
-e INCLUDE_DOCKER=$include_docker \ -e INCLUDE_DOCKER=$include_docker \
-e ROOTFS_PARTSIZE=$rootfs_partsize \ -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 done
- name: Download prebuilt rootfs.tar.gz - name: Download prebuilt rootfs.tar.gz
......
...@@ -7,6 +7,16 @@ name: build-QEMU-armsr-armv8-24.10.2 ...@@ -7,6 +7,16 @@ name: build-QEMU-armsr-armv8-24.10.2
on: on:
workflow_dispatch: workflow_dispatch:
inputs: 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: profile:
type: choice type: choice
description: | description: |
...@@ -72,6 +82,7 @@ jobs: ...@@ -72,6 +82,7 @@ jobs:
run: | run: |
profiles="${{ github.event.inputs.profile }}" profiles="${{ github.event.inputs.profile }}"
rootfs_partsize="${{ github.event.inputs.rootfs_partsize }}" rootfs_partsize="${{ github.event.inputs.rootfs_partsize }}"
luci_version="${{ github.event.inputs.luci_version }}"
IFS=',' read -r -a profile_array <<< "$profiles" IFS=',' read -r -a profile_array <<< "$profiles"
...@@ -91,7 +102,7 @@ jobs: ...@@ -91,7 +102,7 @@ jobs:
-e ENABLE_PPPOE=${{ inputs.enable_pppoe }} \ -e ENABLE_PPPOE=${{ inputs.enable_pppoe }} \
-e PPPOE_ACCOUNT=${{ inputs.pppoe_account }} \ -e PPPOE_ACCOUNT=${{ inputs.pppoe_account }} \
-e PPPOE_PASSWORD=${{ inputs.pppoe_password }} \ -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 done
- name: Generate Firmware SHA-256 - name: Generate Firmware SHA-256
run: | run: |
......
...@@ -14,6 +14,16 @@ on: ...@@ -14,6 +14,16 @@ on:
- rpi-4 - rpi-4
- rpi-5 - rpi-5
default: rpi-4 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: enable_store:
description: "集成 store 商店" description: "集成 store 商店"
required: false required: false
...@@ -58,25 +68,27 @@ jobs: ...@@ -58,25 +68,27 @@ jobs:
- name: Build raspberrypi ImmortalWrt 24.10.2 - name: Build raspberrypi ImmortalWrt 24.10.2
run: | run: |
luci_version="${{ github.event.inputs.luci_version }}"
profiles="${{ github.event.inputs.profile }}" profiles="${{ github.event.inputs.profile }}"
if [ "$profiles" = "rpi" ]; then if [ "$profiles" = "rpi" ]; then
tag=bcm27xx-bcm2708-openwrt-24.10.2 tag=bcm27xx-bcm2708-openwrt-${luci_version}
echo "cpu=bcm2708" >> $GITHUB_ENV echo "cpu=bcm2708" >> $GITHUB_ENV
elif [ "$profiles" = "rpi-2" ]; then elif [ "$profiles" = "rpi-2" ]; then
tag=bcm27xx-bcm2709-openwrt-24.10.2 tag=bcm27xx-bcm2709-openwrt-${luci_version}
echo "cpu=bcm2709" >> $GITHUB_ENV echo "cpu=bcm2709" >> $GITHUB_ENV
elif [ "$profiles" = "rpi-3" ]; then elif [ "$profiles" = "rpi-3" ]; then
tag=bcm27xx-bcm2710-openwrt-24.10.2 tag=bcm27xx-bcm2710-openwrt-${luci_version}
echo "cpu=bcm2710" >> $GITHUB_ENV echo "cpu=bcm2710" >> $GITHUB_ENV
elif [ "$profiles" = "rpi-4" ]; then elif [ "$profiles" = "rpi-4" ]; then
tag=bcm27xx-bcm2711-openwrt-24.10.2 tag=bcm27xx-bcm2711-openwrt-${luci_version}
echo "cpu=bcm2711" >> $GITHUB_ENV echo "cpu=bcm2711" >> $GITHUB_ENV
elif [ "$profiles" = "rpi-5" ]; then elif [ "$profiles" = "rpi-5" ]; then
tag=bcm27xx-bcm2712-openwrt-24.10.2 tag=bcm27xx-bcm2712-openwrt-${luci_version}
echo "cpu=bcm2712" >> $GITHUB_ENV echo "cpu=bcm2712" >> $GITHUB_ENV
fi fi
include_docker="${{ github.event.inputs.include_docker }}" include_docker="${{ github.event.inputs.include_docker }}"
size="${{ github.event.inputs.size }}" size="${{ github.event.inputs.size }}"
IFS=',' read -r -a profile_array <<< "$profiles" IFS=',' read -r -a profile_array <<< "$profiles"
for profile in "${profile_array[@]}"; do for profile in "${profile_array[@]}"; do
echo "Building for profile: $profile" echo "Building for profile: $profile"
......
...@@ -2,6 +2,16 @@ name: Build boxs by ophub ...@@ -2,6 +2,16 @@ name: Build boxs by ophub
on: on:
workflow_dispatch: workflow_dispatch:
inputs: 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: openwrt_kernel:
description: "选择构建的内核 当高版本内核没有时 系统会自动挑选匹配的内核。比如radxa e52c 即便你选择了6.1.y 可能最终构建还是5.10.160" description: "选择构建的内核 当高版本内核没有时 系统会自动挑选匹配的内核。比如radxa e52c 即便你选择了6.1.y 可能最终构建还是5.10.160"
required: false required: false
...@@ -245,6 +255,7 @@ jobs: ...@@ -245,6 +255,7 @@ jobs:
profiles="generic" profiles="generic"
include_docker="${{ github.event.inputs.include_docker }}" include_docker="${{ github.event.inputs.include_docker }}"
rootfs_partsize="${{ github.event.inputs.rootfs_partsize }}" rootfs_partsize="${{ github.event.inputs.rootfs_partsize }}"
luci_version="${{ github.event.inputs.luci_version }}"
IFS=',' read -r -a profile_array <<< "$profiles" IFS=',' read -r -a profile_array <<< "$profiles"
...@@ -263,7 +274,7 @@ jobs: ...@@ -263,7 +274,7 @@ jobs:
-e PROFILE=$profile \ -e PROFILE=$profile \
-e INCLUDE_DOCKER=$include_docker \ -e INCLUDE_DOCKER=$include_docker \
-e ROOTFS_PARTSIZE=$rootfs_partsize \ -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 done
- name: Download prebuilt rootfs.tar.gz - name: Download prebuilt rootfs.tar.gz
......
...@@ -2,6 +2,16 @@ name: Build Dev Board Firmware(Flippy) ...@@ -2,6 +2,16 @@ name: Build Dev Board Firmware(Flippy)
on: on:
workflow_dispatch: workflow_dispatch:
inputs: 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: openwrt_kernel:
description: "选择构建的内核 当高版本内核没有时 系统会自动挑选匹配的内核。比如radxa e52c 即便你选择了6.1.y 可能最终构建还是5.10.160" description: "选择构建的内核 当高版本内核没有时 系统会自动挑选匹配的内核。比如radxa e52c 即便你选择了6.1.y 可能最终构建还是5.10.160"
required: false required: false
...@@ -103,6 +113,7 @@ jobs: ...@@ -103,6 +113,7 @@ jobs:
profiles="generic" profiles="generic"
include_docker="${{ github.event.inputs.include_docker }}" include_docker="${{ github.event.inputs.include_docker }}"
rootfs_partsize="${{ github.event.inputs.rootfs_partsize }}" rootfs_partsize="${{ github.event.inputs.rootfs_partsize }}"
luci_version="${{ github.event.inputs.luci_version }}"
IFS=',' read -r -a profile_array <<< "$profiles" IFS=',' read -r -a profile_array <<< "$profiles"
...@@ -121,7 +132,7 @@ jobs: ...@@ -121,7 +132,7 @@ jobs:
-e PROFILE=$profile \ -e PROFILE=$profile \
-e INCLUDE_DOCKER=$include_docker \ -e INCLUDE_DOCKER=$include_docker \
-e ROOTFS_PARTSIZE=$rootfs_partsize \ -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 done
- name: Download prebuilt rootfs.tar.gz - name: Download prebuilt rootfs.tar.gz
......
...@@ -8,6 +8,16 @@ name: build ISO ...@@ -8,6 +8,16 @@ name: build ISO
on: on:
workflow_dispatch: workflow_dispatch:
inputs: 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: profile:
description: '请输入要编译固件大小 单位(MB)' description: '请输入要编译固件大小 单位(MB)'
required: true required: true
...@@ -73,6 +83,7 @@ jobs: ...@@ -73,6 +83,7 @@ jobs:
run: | run: |
profiles="${{ github.event.inputs.profile }}" profiles="${{ github.event.inputs.profile }}"
include_docker="${{ github.event.inputs.include_docker }}" include_docker="${{ github.event.inputs.include_docker }}"
luci_version="${{ github.event.inputs.luci_version }}"
IFS=',' read -r -a profile_array <<< "$profiles" IFS=',' read -r -a profile_array <<< "$profiles"
for profile in "${profile_array[@]}"; do for profile in "${profile_array[@]}"; do
...@@ -89,7 +100,7 @@ jobs: ...@@ -89,7 +100,7 @@ jobs:
-e ENABLE_PPPOE=${{ inputs.enable_pppoe }} \ -e ENABLE_PPPOE=${{ inputs.enable_pppoe }} \
-e PPPOE_ACCOUNT=${{ inputs.pppoe_account }} \ -e PPPOE_ACCOUNT=${{ inputs.pppoe_account }} \
-e PPPOE_PASSWORD=${{ inputs.pppoe_password }} \ -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 done
- name: ✅ 复制固件到根目录 - name: ✅ 复制固件到根目录
......
...@@ -9,6 +9,8 @@ on: ...@@ -9,6 +9,8 @@ on:
default: "24.10.3" default: "24.10.3"
type: choice type: choice
options: options:
- 24.10.0
- 24.10.1
- 24.10.2 - 24.10.2
- 24.10.3 - 24.10.3
profile: profile:
......
...@@ -5,7 +5,7 @@ on: ...@@ -5,7 +5,7 @@ on:
inputs: inputs:
profile: profile:
type: choice type: choice
description: "请选择路由器型号" description: "请选择开发板型号"
required: true required: true
options: options:
- xunlong_orangepi-zero3 - xunlong_orangepi-zero3
...@@ -19,6 +19,16 @@ on: ...@@ -19,6 +19,16 @@ on:
- pine64_pine64-plus - pine64_pine64-plus
- pine64_sopine-baseboard - pine64_sopine-baseboard
default: xunlong_orangepi-zero3 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: enable_store:
description: "集成 store 商店" description: "集成 store 商店"
required: false required: false
...@@ -65,6 +75,7 @@ jobs: ...@@ -65,6 +75,7 @@ jobs:
profiles="${{ github.event.inputs.profile }}" profiles="${{ github.event.inputs.profile }}"
include_docker="${{ github.event.inputs.include_docker }}" include_docker="${{ github.event.inputs.include_docker }}"
size="${{ github.event.inputs.size }}" size="${{ github.event.inputs.size }}"
luci_version="${{ github.event.inputs.luci_version }}"
IFS=',' read -r -a profile_array <<< "$profiles" IFS=',' read -r -a profile_array <<< "$profiles"
...@@ -81,7 +92,7 @@ jobs: ...@@ -81,7 +92,7 @@ jobs:
-e PROFILE=$profile \ -e PROFILE=$profile \
-e INCLUDE_DOCKER=$include_docker \ -e INCLUDE_DOCKER=$include_docker \
-e ROOTSIZE=$size \ -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 done
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
# jcg_q30-ubootmod # jcg_q30-ubootmod
# qihoo_360t7-ubootmod # qihoo_360t7-ubootmod
# xiaomi_mi-router-wr30u-112m-nmbm # xiaomi_mi-router-wr30u-112m-nmbm
# xiaomi_redmi-router-ax6000 该机型在24.10.2 分化为2个机型 # xiaomi_redmi-router-ax6000 该机型在24.10.3 分化为2个机型
# —————————————————————————————24.10.2————————————————————————————————— # —————————————————————————————24.10.3—————————————————————————————————
# xiaomi_redmi-router-ax6000-stock ————原厂默认 bootloader(stock)版本 # xiaomi_redmi-router-ax6000-stock ————原厂默认 bootloader(stock)版本
# xiaomi_redmi-router-ax6000-ubootmod—————改装过 bootloader 的版本(ubootmod) # xiaomi_redmi-router-ax6000-ubootmod—————改装过 bootloader 的版本(ubootmod)
...@@ -558,7 +558,7 @@ jobs: ...@@ -558,7 +558,7 @@ jobs:
fi fi
- name: Build Wireless ImmortalWrt 24.10.2 - name: Build Wireless ImmortalWrt
run: | run: |
profile="${{ github.event.inputs.profile }}" profile="${{ github.event.inputs.profile }}"
echo "Building for profile: $profile" echo "Building for profile: $profile"
...@@ -570,7 +570,7 @@ jobs: ...@@ -570,7 +570,7 @@ jobs:
ipq807x_models=$(cat model/ipq807x.txt | tr '\n' '|') ipq807x_models=$(cat model/ipq807x.txt | tr '\n' '|')
ipq807x_models=${ipq807x_models%|} ipq807x_models=${ipq807x_models%|}
if [[ "$profile" =~ ^($ipq807x_models)$ ]]; then 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" case_platform="qualcommax/ipq807x"
fi fi
...@@ -578,7 +578,7 @@ jobs: ...@@ -578,7 +578,7 @@ jobs:
mt7621_models=$(cat model/mt7621.txt | tr '\n' '|') mt7621_models=$(cat model/mt7621.txt | tr '\n' '|')
mt7621_models=${mt7621_models%|} mt7621_models=${mt7621_models%|}
if [[ "$profile" =~ ^($mt7621_models)$ ]]; then 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" case_platform="ramips/mt7621"
fi fi
...@@ -586,7 +586,7 @@ jobs: ...@@ -586,7 +586,7 @@ jobs:
bcm53xx_models=$(cat model/bcm53xx.txt | tr '\n' '|') bcm53xx_models=$(cat model/bcm53xx.txt | tr '\n' '|')
bcm53xx_models=${bcm53xx_models%|} bcm53xx_models=${bcm53xx_models%|}
if [[ "$profile" =~ ^($bcm53xx_models)$ ]]; then 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" case_platform="bcm53xx/generic"
fi fi
...@@ -594,7 +594,7 @@ jobs: ...@@ -594,7 +594,7 @@ jobs:
case "$profile" in case "$profile" in
glinet_gl-b2200) glinet_gl-b2200)
# 虽然它是高通ipq40xx平台 但由于都是gl机型 故放在一起 找起来方便 # 虽然它是高通ipq40xx平台 但由于都是gl机型 故放在一起 找起来方便
tag=ipq40xx-generic-openwrt-24.10.2 tag=ipq40xx-generic-openwrt-24.10.3
echo "platform=ipq40xx/generic" >> $GITHUB_ENV echo "platform=ipq40xx/generic" >> $GITHUB_ENV
;; ;;
glinet_gl-axt1800|glinet_gl-ax1800) glinet_gl-axt1800|glinet_gl-ax1800)
...@@ -603,11 +603,11 @@ jobs: ...@@ -603,11 +603,11 @@ jobs:
echo "platform=qualcommax/ipq60xx" >> $GITHUB_ENV echo "platform=qualcommax/ipq60xx" >> $GITHUB_ENV
;; ;;
cudy_tr3000-256mb-v1) cudy_tr3000-256mb-v1)
# 由于256MB版本tr3000 还没有出正式版24.10.2 故使用快照版本来构建 # 由于256MB版本tr3000 还没有出正式版24.10.3 故使用快照版本来构建
tag=mediatek-filogic-24.10-SNAPSHOT tag=mediatek-filogic-24.10-SNAPSHOT
;; ;;
xiaomi_redmi-router-ax6s) xiaomi_redmi-router-ax6s)
tag=mediatek-mt7622-openwrt-24.10.2 tag=mediatek-mt7622-openwrt-24.10.3
echo "platform=mediatek/mt7622" >> $GITHUB_ENV echo "platform=mediatek/mt7622" >> $GITHUB_ENV
;; ;;
# 下列机型目前没有24.10 因此采用23.05.4分支来构建 # 下列机型目前没有24.10 因此采用23.05.4分支来构建
...@@ -633,7 +633,7 @@ jobs: ...@@ -633,7 +633,7 @@ jobs:
echo "platform=$case_platform" >> $GITHUB_ENV echo "platform=$case_platform" >> $GITHUB_ENV
else else
# 默认分支 # 默认分支
tag=mediatek-filogic-openwrt-24.10.2 tag=mediatek-filogic-openwrt-24.10.3
fi fi
;; ;;
esac esac
......
...@@ -9,6 +9,8 @@ on: ...@@ -9,6 +9,8 @@ on:
default: "24.10.3" default: "24.10.3"
type: choice type: choice
options: options:
- 24.10.0
- 24.10.1
- 24.10.2 - 24.10.2
- 24.10.3 - 24.10.3
custom_router_ip: custom_router_ip:
......
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