xinb
/
X-OpenWrt
mirror of https://github.com/xopenwrt/X-OpenWrt-New.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

不合并标识修改为 '## TEST'

This commit is contained in:
Hyy2001X 2021-07-26 01:29:03 +08:00
parent 7f6db500b4
commit 9bb0a8d47b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Configs/redmi_ax6
View File

@ -2,4 +2,4 @@ CONFIG_TARGET_ipq807x=y
CONFIG_TARGET_ipq807x_generic=y CONFIG_TARGET_ipq807x_generic=y
CONFIG_TARGET_ipq807x_generic_DEVICE_redmi_ax6=y CONFIG_TARGET_ipq807x_generic_DEVICE_redmi_ax6=y
## DO NOT MERGE ## TEST

4
Scripts/AutoBuild_Function.sh
View File

@ -227,11 +227,11 @@ Firmware-Diy_Other() {
fi fi
fi fi
if [[ -s $GITHUB_WORKSPACE/Configs/Common ]];then if [[ -s $GITHUB_WORKSPACE/Configs/Common ]];then
[[ ! "$(cat .config)" =~ "## DO NOT MERGE" ]] && { [[ ! "$(cat .config)" =~ "## TEST" ]] && {
TIME "Merging [Configs/Common] to .config ..." TIME "Merging [Configs/Common] to .config ..."
echo -e "\n$(cat $GITHUB_WORKSPACE/Configs/Common)" >> .config echo -e "\n$(cat $GITHUB_WORKSPACE/Configs/Common)" >> .config
} || { } || {
sed -i '/## DO NOT MERGE/d' .config >/dev/null 2>&1 sed -i '/## TEST/d' .config >/dev/null 2>&1
} }
fi fi
} }