修复编译冲突
This commit is contained in:
parent
fd5dff9bf2
commit
e3216e6876
|
@ -35,9 +35,9 @@ on:
|
|||
### 环境变量设置
|
||||
env:
|
||||
# 编译时调用的 [.config] 文件名称
|
||||
CONFIG_FILE: xiaomi_redmi-router-ax6s
|
||||
CONFIG_FILE: xiaomi_redmi-router-ax6s-test
|
||||
# 源码仓库:分支
|
||||
DEFAULT_SOURCE: immortalwrt/immortalwrt:openwrt-18.06-k5.4
|
||||
DEFAULT_SOURCE: immortalwrt/immortalwrt:master
|
||||
# 上传固件到 Github Releases
|
||||
UPLOAD_RELEASES: true
|
||||
# 上传固件到 Github Artifacts
|
||||
|
|
|
@ -12,7 +12,6 @@ CONFIG_PACKAGE_ipv6helper=y
|
|||
CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y
|
||||
|
||||
# LUCI Appliciations
|
||||
CONFIG_PACKAGE_luci-app-argon-config=y
|
||||
CONFIG_PACKAGE_luci-app-adbyby-plus=y
|
||||
CONFIG_PACKAGE_luci-app-adguardhome=y
|
||||
CONFIG_PACKAGE_luci-app-autoupdate=y
|
||||
|
|
|
@ -163,7 +163,7 @@ EOF
|
|||
Copy ${Scripts}/AutoBuild_Tools.sh ${BASE_FILES}/bin
|
||||
Copy ${Scripts}/AutoUpdate.sh ${BASE_FILES}/bin
|
||||
AutoUpdate_Version=$(awk -F '=' '/Version/{print $2}' ${BASE_FILES}/bin/AutoUpdate.sh | awk 'NR==1')
|
||||
AddPackage svn lean luci-app-autoupdate Hyy2001X/AutoBuild-Packages/trunk
|
||||
AddPackage svn other luci-app-autoupdate Hyy2001X/AutoBuild-Packages/trunk
|
||||
Copy ${CustomFiles}/Depends/profile ${BASE_FILES}/etc
|
||||
Copy ${CustomFiles}/Depends/base-files-essential ${BASE_FILES}/lib/upgrade/keep.d
|
||||
case "${OP_AUTHOR}/${OP_REPO}" in
|
||||
|
|
Loading…
Reference in New Issue