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

将是否集成store商店 放置于UI选项

parent 92afb990
...@@ -90,6 +90,11 @@ on: ...@@ -90,6 +90,11 @@ on:
options: options:
- 'yes' - 'yes'
- 'no' - 'no'
enable_store:
description: "集成 store 商店"
required: false
type: boolean
default: true
skip_imagebuilder: skip_imagebuilder:
description: "直接使用底包快速构建固件, 忽略自定义插件 ----(跳过 ImageBuilder)" description: "直接使用底包快速构建固件, 忽略自定义插件 ----(跳过 ImageBuilder)"
required: false required: false
...@@ -124,6 +129,15 @@ jobs: ...@@ -124,6 +129,15 @@ jobs:
- name: Debug workspace contents - name: Debug workspace contents
run: ls -R run: ls -R
- name: Enable Store integration
run: |
if [ "${{ github.event.inputs.enable_store }}" == "true" ]; then
echo 'CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-app-store"' >> shell/custom-packages.sh
echo "✅ 已追加 luci-app-store"
else
echo "❎ 未启用 luci-app-store"
fi
- name: 处理是否替换 banner 信息 - name: 处理是否替换 banner 信息
if: ${{ github.event.inputs.skip_imagebuilder == 'false' && github.event.inputs.replace_banner == 'true' }} if: ${{ github.event.inputs.skip_imagebuilder == 'false' && github.event.inputs.replace_banner == 'true' }}
......
...@@ -19,6 +19,11 @@ on: ...@@ -19,6 +19,11 @@ on:
description: '设置软件包大小 单位(MB) 最大数值10240' description: '设置软件包大小 单位(MB) 最大数值10240'
required: true required: true
default: '2048' default: '2048'
enable_store:
description: "集成 store 商店"
required: false
type: boolean
default: true
enable_pppoe: enable_pppoe:
description: "是否配置PPPoE拨号信息?" description: "是否配置PPPoE拨号信息?"
required: true required: true
...@@ -45,6 +50,15 @@ jobs: ...@@ -45,6 +50,15 @@ jobs:
- name: Set executable permissions - name: Set executable permissions
run: chmod +x ${{ github.workspace }}/armsr-armv8/build.sh run: chmod +x ${{ github.workspace }}/armsr-armv8/build.sh
- name: Enable Store integration
run: |
if [ "${{ github.event.inputs.enable_store }}" == "true" ]; then
echo 'CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-app-store"' >> shell/custom-packages.sh
echo "✅ 已追加 luci-app-store"
else
echo "❎ 未启用 luci-app-store"
fi
- name: Validate PPPoE Inputs - name: Validate PPPoE Inputs
run: | run: |
if [[ "${{ inputs.enable_pppoe }}" == "yes" ]]; then if [[ "${{ inputs.enable_pppoe }}" == "yes" ]]; then
......
...@@ -14,6 +14,11 @@ on: ...@@ -14,6 +14,11 @@ on:
- rpi-4 - rpi-4
- rpi-5 - rpi-5
default: rpi-4 default: rpi-4
enable_store:
description: "集成 store 商店"
required: false
type: boolean
default: true
include_docker: include_docker:
description: | description: |
是否编译 Docker 插件 是否编译 Docker 插件
...@@ -41,6 +46,15 @@ jobs: ...@@ -41,6 +46,15 @@ jobs:
run: | run: |
chmod +x ${{ github.workspace }}/raspberrypi/23.05.4/build.sh chmod +x ${{ github.workspace }}/raspberrypi/23.05.4/build.sh
- name: Enable Store integration
run: |
if [ "${{ github.event.inputs.enable_store }}" == "true" ]; then
echo 'CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-app-store"' >> shell/custom-packages.sh
echo "✅ 已追加 luci-app-store"
else
echo "❎ 未启用 luci-app-store"
fi
- name: Build raspberrypi ImmortalWrt 23.05.4 - name: Build raspberrypi ImmortalWrt 23.05.4
run: | run: |
profiles="${{ github.event.inputs.profile }}" profiles="${{ github.event.inputs.profile }}"
......
...@@ -14,6 +14,11 @@ on: ...@@ -14,6 +14,11 @@ on:
- rpi-4 - rpi-4
- rpi-5 - rpi-5
default: rpi-4 default: rpi-4
enable_store:
description: "集成 store 商店"
required: false
type: boolean
default: true
include_docker: include_docker:
description: | description: |
是否编译 Docker 插件 是否编译 Docker 插件
...@@ -41,6 +46,16 @@ jobs: ...@@ -41,6 +46,16 @@ jobs:
run: | run: |
chmod +x ${{ github.workspace }}/raspberrypi/24.10/build.sh chmod +x ${{ github.workspace }}/raspberrypi/24.10/build.sh
- name: Enable Store integration
run: |
if [ "${{ github.event.inputs.enable_store }}" == "true" ]; then
echo 'CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-app-store"' >> shell/custom-packages.sh
echo "✅ 已追加 luci-app-store"
else
echo "❎ 未启用 luci-app-store"
fi
- name: Build raspberrypi ImmortalWrt 24.10.2 - name: Build raspberrypi ImmortalWrt 24.10.2
run: | run: |
profiles="${{ github.event.inputs.profile }}" profiles="${{ github.event.inputs.profile }}"
......
...@@ -183,6 +183,11 @@ on: ...@@ -183,6 +183,11 @@ on:
options: options:
- 'yes' - 'yes'
- 'no' - 'no'
enable_store:
description: "集成 store 商店"
required: false
type: boolean
default: true
skip_imagebuilder: skip_imagebuilder:
description: "直接使用底包快速构建固件, 忽略自定义插件 ----(跳过 ImageBuilder)" description: "直接使用底包快速构建固件, 忽略自定义插件 ----(跳过 ImageBuilder)"
required: false required: false
...@@ -217,6 +222,15 @@ jobs: ...@@ -217,6 +222,15 @@ jobs:
- name: Debug workspace contents - name: Debug workspace contents
run: ls -R run: ls -R
- name: Enable Store integration
run: |
if [ "${{ github.event.inputs.enable_store }}" == "true" ]; then
echo 'CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-app-store"' >> shell/custom-packages.sh
echo "✅ 已追加 luci-app-store"
else
echo "❎ 未启用 luci-app-store"
fi
- name: 处理是否替换 banner 信息 - name: 处理是否替换 banner 信息
if: ${{ github.event.inputs.skip_imagebuilder == 'false' && github.event.inputs.replace_banner == 'true' }} if: ${{ github.event.inputs.skip_imagebuilder == 'false' && github.event.inputs.replace_banner == 'true' }}
......
...@@ -20,6 +20,11 @@ on: ...@@ -20,6 +20,11 @@ on:
options: options:
- 'yes' - 'yes'
- 'no' - 'no'
enable_store:
description: "集成 store 商店"
required: false
type: boolean
default: true
enable_pppoe: enable_pppoe:
description: "是否配置PPPoE拨号信息?" description: "是否配置PPPoE拨号信息?"
required: true required: true
...@@ -45,6 +50,15 @@ jobs: ...@@ -45,6 +50,15 @@ jobs:
- name: Set executable permissions - name: Set executable permissions
run: chmod +x ${{ github.workspace }}/x86-64/build24.sh run: chmod +x ${{ github.workspace }}/x86-64/build24.sh
- name: Enable Store integration
run: |
if [ "${{ github.event.inputs.enable_store }}" == "true" ]; then
echo 'CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-app-store"' >> shell/custom-packages.sh
echo "✅ 已追加 luci-app-store"
else
echo "❎ 未启用 luci-app-store"
fi
- name: Validate PPPoE Inputs - name: Validate PPPoE Inputs
run: | run: |
......
...@@ -37,6 +37,11 @@ on: ...@@ -37,6 +37,11 @@ on:
description: '设置软件包大小 单位(MB)' description: '设置软件包大小 单位(MB)'
required: true required: true
default: '1024' default: '1024'
enable_store:
description: "集成 store 商店"
required: false
type: boolean
default: true
include_docker: include_docker:
description: | description: |
是否编译 Docker 插件 是否编译 Docker 插件
...@@ -80,6 +85,15 @@ jobs: ...@@ -80,6 +85,15 @@ jobs:
exit 1 exit 1
fi fi
fi fi
- name: Enable Store integration
run: |
if [ "${{ github.event.inputs.enable_store }}" == "true" ]; then
echo 'CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-app-store"' >> shell/custom-packages.sh
echo "✅ 已追加 luci-app-store"
else
echo "❎ 未启用 luci-app-store"
fi
- name: Building Rockchip ImmortalWrt - name: Building Rockchip ImmortalWrt
run: | run: |
......
...@@ -57,6 +57,11 @@ on: ...@@ -57,6 +57,11 @@ on:
description: '设置软件包大小 单位(MB)' description: '设置软件包大小 单位(MB)'
required: true required: true
default: '1024' default: '1024'
enable_store:
description: "集成 store 商店"
required: false
type: boolean
default: true
include_docker: include_docker:
description: | description: |
是否编译 Docker 插件 是否编译 Docker 插件
...@@ -100,6 +105,15 @@ jobs: ...@@ -100,6 +105,15 @@ jobs:
exit 1 exit 1
fi fi
fi fi
- name: Enable Store integration
run: |
if [ "${{ github.event.inputs.enable_store }}" == "true" ]; then
echo 'CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-app-store"' >> shell/custom-packages.sh
echo "✅ 已追加 luci-app-store"
else
echo "❎ 未启用 luci-app-store"
fi
- name: Building Rockchip ImmortalWrt - name: Building Rockchip ImmortalWrt
......
...@@ -17,6 +17,11 @@ on: ...@@ -17,6 +17,11 @@ on:
- pine64_pine64-plus - pine64_pine64-plus
- pine64_sopine-baseboard - pine64_sopine-baseboard
default: friendlyarm_nanopi-r1s-h5 default: friendlyarm_nanopi-r1s-h5
enable_store:
description: "集成 store 商店"
required: false
type: boolean
default: true
include_docker: include_docker:
description: | description: |
是否编译 Docker 插件 是否编译 Docker 插件
...@@ -44,6 +49,15 @@ jobs: ...@@ -44,6 +49,15 @@ jobs:
run: | run: |
chmod +x ${{ github.workspace }}/sunxi-cortexa53/build23.sh chmod +x ${{ github.workspace }}/sunxi-cortexa53/build23.sh
- name: Enable Store integration
run: |
if [ "${{ github.event.inputs.enable_store }}" == "true" ]; then
echo 'CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-app-store"' >> shell/custom-packages.sh
echo "✅ 已追加 luci-app-store"
else
echo "❎ 未启用 luci-app-store"
fi
- name: Build sunxi-cortexa53 ImmpotalWrt 23.05.4 - name: Build sunxi-cortexa53 ImmpotalWrt 23.05.4
run: | run: |
profiles="${{ github.event.inputs.profile }}" profiles="${{ github.event.inputs.profile }}"
......
...@@ -19,6 +19,11 @@ on: ...@@ -19,6 +19,11 @@ on:
- pine64_pine64-plus - pine64_pine64-plus
- pine64_sopine-baseboard - pine64_sopine-baseboard
default: xunlong_orangepi-zero3 default: xunlong_orangepi-zero3
enable_store:
description: "集成 store 商店"
required: false
type: boolean
default: true
include_docker: include_docker:
description: | description: |
是否编译 Docker 插件 是否编译 Docker 插件
...@@ -46,6 +51,15 @@ jobs: ...@@ -46,6 +51,15 @@ jobs:
run: | run: |
chmod +x ${{ github.workspace }}/sunxi-cortexa53/build24.sh chmod +x ${{ github.workspace }}/sunxi-cortexa53/build24.sh
- name: Enable Store integration
run: |
if [ "${{ github.event.inputs.enable_store }}" == "true" ]; then
echo 'CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-app-store"' >> shell/custom-packages.sh
echo "✅ 已追加 luci-app-store"
else
echo "❎ 未启用 luci-app-store"
fi
- name: Build sunxi-cortexa53 ImmpotalWrt 24.10.2 - name: Build sunxi-cortexa53 ImmpotalWrt 24.10.2
run: | run: |
profiles="${{ github.event.inputs.profile }}" profiles="${{ github.event.inputs.profile }}"
......
...@@ -488,6 +488,11 @@ on: ...@@ -488,6 +488,11 @@ on:
description: "请设置路由器的管理地址 格式:192.168.x.1 10.x.x.1" description: "请设置路由器的管理地址 格式:192.168.x.1 10.x.x.1"
required: true required: true
default: "192.168.100.1" default: "192.168.100.1"
enable_store:
description: "集成 store 商店"
required: false
type: boolean
default: false
include_docker: include_docker:
description: | description: |
是否编译 Docker 插件 是否编译 Docker 插件
...@@ -541,6 +546,15 @@ jobs: ...@@ -541,6 +546,15 @@ jobs:
exit 1 exit 1
fi fi
fi fi
- name: Enable Store integration
run: |
if [ "${{ github.event.inputs.enable_store }}" == "true" ]; then
echo 'CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-app-store"' >> shell/custom-packages.sh
echo "✅ 已追加 luci-app-store"
else
echo "❎ 未启用 luci-app-store"
fi
- name: Build Wireless ImmortalWrt 24.10.2 - name: Build Wireless ImmortalWrt 24.10.2
......
...@@ -11,6 +11,11 @@ on: ...@@ -11,6 +11,11 @@ on:
description: '请输入要编译固件大小 单位(MB)' description: '请输入要编译固件大小 单位(MB)'
required: true required: true
default: '1024' default: '1024'
enable_store:
description: "集成 store 商店"
required: false
type: boolean
default: true
include_docker: include_docker:
description: | description: |
是否编译 Docker 插件 是否编译 Docker 插件
...@@ -62,6 +67,15 @@ jobs: ...@@ -62,6 +67,15 @@ jobs:
exit 1 exit 1
fi fi
fi fi
- name: Enable Store integration
run: |
if [ "${{ github.event.inputs.enable_store }}" == "true" ]; then
echo 'CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-app-store"' >> shell/custom-packages.sh
echo "✅ 已追加 luci-app-store"
else
echo "❎ 未启用 luci-app-store"
fi
- name: Build ImmortalWrt-x86-64-efi - name: Build ImmortalWrt-x86-64-efi
run: | run: |
......
...@@ -11,6 +11,11 @@ on: ...@@ -11,6 +11,11 @@ on:
description: '请输入要编译固件大小 单位(MB)' description: '请输入要编译固件大小 单位(MB)'
required: true required: true
default: '1024' default: '1024'
enable_store:
description: "集成 store 商店"
required: false
type: boolean
default: true
include_docker: include_docker:
description: | description: |
是否编译 Docker 插件 是否编译 Docker 插件
...@@ -61,6 +66,15 @@ jobs: ...@@ -61,6 +66,15 @@ jobs:
exit 1 exit 1
fi fi
fi fi
- name: Enable Store integration
run: |
if [ "${{ github.event.inputs.enable_store }}" == "true" ]; then
echo 'CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-app-store"' >> shell/custom-packages.sh
echo "✅ 已追加 luci-app-store"
else
echo "❎ 未启用 luci-app-store"
fi
- name: Build ImmortalWrt-x86-64-efi - name: Build ImmortalWrt-x86-64-efi
run: | run: |
......
#!/bin/bash #!/bin/bash
# ============= imm仓库外的第三方插件============== # ============= imm仓库外的第三方插件==============
# ============= 若启用 则打开注释 ================ # ============= 若启用 则打开注释 ================
# 注意如果构建MT7621平台的路由器的固件 请不要集成第三方软件 因为这里的软件都是aarch64_cortex-a53 或 aarch64_generic 不是MIPS 1004Kc平台的 # ============= 但此文件也可以处理仓库内的软件去留 本质上是做了一个PACKAGES字符串的拼接 ================
# istore商店
#CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-app-store" # 各位注意 如果你构建的固件是硬路由 此文件的注释要酌情考虑是否打开 因为硬路由的闪存空间有限 若构建出来过大或者构建失败 记得调整本文件的注释
# 考虑到istore商店的集成与否 属于高频操作 故 目前已将集成store的操作放置在 工作流的UI 选项 用户自行勾选 则集成 不勾选则不集成 以减少修改此文件的次数
# 首页和网络向导 # 首页和网络向导
#CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-i18n-quickstart-zh-cn" #CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-i18n-quickstart-zh-cn"
# 去广告adghome # 去广告adghome
#CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-app-adguardhome" #CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-app-adguardhome"
# 代理相关 # 代理相关
#CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-i18n-passwall-zh-cn" #CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-i18n-passwall-zh-cn"
#CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-app-openclash"
#CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-i18n-homeproxy-zh-cn"
#CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-app-ssr-plus" #CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-app-ssr-plus"
#CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-app-passwall2" #CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-app-passwall2"
#CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-i18n-nikki-zh-cn" #CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-i18n-nikki-zh-cn"
#CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-app-nekobox" #CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-app-nekobox"
# 同样是代理相关 但以下2个属于imm仓库内的软件 一般在build24.sh中已经集成 你也可以在此处调整它的去留 若去除组件则使用减号- 若添加则 不使用减号 或者 不处理
#CUSTOM_PACKAGES="$CUSTOM_PACKAGES -luci-app-openclash"
#CUSTOM_PACKAGES="$CUSTOM_PACKAGES -luci-i18n-homeproxy-zh-cn"
# VPN # VPN
#CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-app-tailscale luci-i18n-tailscale-zh-cn" #CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-app-tailscale luci-i18n-tailscale-zh-cn"
# 分区扩容 by sirpdboy # 分区扩容 by sirpdboy
......
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