From 9bb0a8d47b7dfc19de9f98d80fb09592fcf1b768 Mon Sep 17 00:00:00 2001 From: Hyy2001X <1804430051@qq.com> Date: Mon, 26 Jul 2021 01:29:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=90=88=E5=B9=B6=E6=A0=87=E8=AF=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=20'##=20TEST'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Configs/redmi_ax6 | 2 +- Scripts/AutoBuild_Function.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Configs/redmi_ax6 b/Configs/redmi_ax6 index ccbd16d..7cd80a1 100644 --- a/Configs/redmi_ax6 +++ b/Configs/redmi_ax6 @@ -2,4 +2,4 @@ CONFIG_TARGET_ipq807x=y CONFIG_TARGET_ipq807x_generic=y CONFIG_TARGET_ipq807x_generic_DEVICE_redmi_ax6=y -## DO NOT MERGE \ No newline at end of file +## TEST \ No newline at end of file diff --git a/Scripts/AutoBuild_Function.sh b/Scripts/AutoBuild_Function.sh index ed7dbb1..ad496b0 100755 --- a/Scripts/AutoBuild_Function.sh +++ b/Scripts/AutoBuild_Function.sh @@ -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 }