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

增加可选luci版本的选项

parent 272b18b6
...@@ -3,6 +3,14 @@ name: build-rockchip-immortalWrt-24.10.2 ...@@ -3,6 +3,14 @@ name: build-rockchip-immortalWrt-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.2
- 24.10.3
profile: profile:
type: choice type: choice
description: | description: |
...@@ -132,6 +140,7 @@ jobs: ...@@ -132,6 +140,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 }}"
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"
...@@ -152,7 +161,7 @@ jobs: ...@@ -152,7 +161,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:rockchip-armv8-openwrt-24.10.3 /bin/bash /home/build/immortalwrt/build.sh immortalwrt/imagebuilder:rockchip-armv8-openwrt-${luci_version} /bin/bash /home/build/immortalwrt/build.sh
done done
- name: Create info - name: Create info
......
...@@ -3,6 +3,14 @@ name: build-x86-64-immortalwrt-24.10.2 ...@@ -3,6 +3,14 @@ name: build-x86-64-immortalwrt-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.2
- 24.10.3
custom_router_ip: custom_router_ip:
description: "请设置路由器的管理地址(仅对多网口路由器有效) 格式:192.168.x.1 10.x.x.1" description: "请设置路由器的管理地址(仅对多网口路由器有效) 格式:192.168.x.1 10.x.x.1"
required: true required: true
...@@ -80,6 +88,7 @@ jobs: ...@@ -80,6 +88,7 @@ jobs:
run: | run: |
profile="${{ github.event.inputs.profile }}" profile="${{ 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 }}"
echo "Building for profile: $profile" echo "Building for profile: $profile"
docker run --rm -i \ docker run --rm -i \
--user root \ --user root \
...@@ -94,7 +103,7 @@ jobs: ...@@ -94,7 +103,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.3 /bin/bash /home/build/immortalwrt/build.sh immortalwrt/imagebuilder:x86-64-openwrt-${luci_version} /bin/bash /home/build/immortalwrt/build.sh
- name: Create info - 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