mirror of
https://github.com/xopenwrt/X-OpenWrt-New.git
synced 2026-09-18 08:20:11 +00:00
不合并标识修改为 '## TEST'
This commit is contained in:
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user