不合并标识修改为 '## TEST'
This commit is contained in:
parent
7f6db500b4
commit
9bb0a8d47b
|
@ -2,4 +2,4 @@ CONFIG_TARGET_ipq807x=y
|
|||
CONFIG_TARGET_ipq807x_generic=y
|
||||
CONFIG_TARGET_ipq807x_generic_DEVICE_redmi_ax6=y
|
||||
|
||||
## DO NOT MERGE
|
||||
## TEST
|
|
@ -227,11 +227,11 @@ Firmware-Diy_Other() {
|
|||
fi
|
||||
fi
|
||||
if [[ -s $GITHUB_WORKSPACE/Configs/Common ]];then
|
||||
[[ ! "$(cat .config)" =~ "## DO NOT MERGE" ]] && {
|
||||
[[ ! "$(cat .config)" =~ "## TEST" ]] && {
|
||||
TIME "Merging [Configs/Common] to .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
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue