From 052cc3459186ff99c6eca2a5a5138daa9f2d6414 Mon Sep 17 00:00:00 2001 From: Hyy2001X <1804430051@qq.com> Date: Fri, 23 Jul 2021 16:29:25 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=B7=BB=E5=8A=A0=20config=20?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=83=A8=E5=88=86=E6=8F=90=E7=A4=BA=20(?= =?UTF-8?q?=E4=BB=85=E4=BE=9B=E5=8F=82=E8=80=83)"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 90e1566a544c48ce6f3edfdc27e9c44272ffe64e. --- .github/workflows/AutoBuild-Test.yml | 9 +-------- .github/workflows/AutoBuild-asus_rt-acrh17.yml | 9 +-------- .github/workflows/AutoBuild-d-team_newifi-d2.yml | 9 +-------- .github/workflows/AutoBuild-redmi_ax6.yml | 9 +-------- .github/workflows/AutoBuild-x86_64.yml | 9 +-------- .../workflows/AutoBuild-xiaomi_redmi-router-ac2100.yml | 9 +-------- .github/workflows/AutoBuild-xiaoyu_xy-c5.yml | 9 +-------- 7 files changed, 7 insertions(+), 56 deletions(-) diff --git a/.github/workflows/AutoBuild-Test.yml b/.github/workflows/AutoBuild-Test.yml index f0a53cd..f774ddd 100644 --- a/.github/workflows/AutoBuild-Test.yml +++ b/.github/workflows/AutoBuild-Test.yml @@ -98,17 +98,10 @@ jobs: - name: Run AutoBuild_DiyScript.sh run: | - #!/bin/bash chmod +x Scripts/AutoBuild_*.sh cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE openwrt/.config cd openwrt - egrep -v "^#|LEVEL|DEFAULT|=[0-9]" .config | grep "CONFIG_PACKAGE" | sed '/^\s*$/d' | while read X;do - line=$(grep -n "${X}" .config | cut -d ':' -f1) - [[ ! ${X} =~ '=' || -z $(echo ${X} | cut -d '=' -f2) || ! $(echo ${X} | cut -d '=' -f2) =~ [nym] ]] && { - echo "ERROR in line ${line}: ${X}" - } - done - make defconfig + make defconfig > /dev/null 2>&1 source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh Firmware-Diy_Main diff --git a/.github/workflows/AutoBuild-asus_rt-acrh17.yml b/.github/workflows/AutoBuild-asus_rt-acrh17.yml index b84ab28..d5d974f 100644 --- a/.github/workflows/AutoBuild-asus_rt-acrh17.yml +++ b/.github/workflows/AutoBuild-asus_rt-acrh17.yml @@ -101,17 +101,10 @@ jobs: - name: Run AutoBuild_DiyScript.sh run: | - #!/bin/bash chmod +x Scripts/AutoBuild_*.sh cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE openwrt/.config cd openwrt - egrep -v "^#|LEVEL|DEFAULT|=[0-9]" .config | grep "CONFIG_PACKAGE" | sed '/^\s*$/d' | while read X;do - line=$(grep -n "${X}" .config | cut -d ':' -f1) - [[ ! ${X} =~ '=' || -z $(echo ${X} | cut -d '=' -f2) || ! $(echo ${X} | cut -d '=' -f2) =~ [nym] ]] && { - echo "ERROR in line ${line}: ${X}" - } - done - make defconfig + make defconfig > /dev/null 2>&1 source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh Firmware-Diy_Main diff --git a/.github/workflows/AutoBuild-d-team_newifi-d2.yml b/.github/workflows/AutoBuild-d-team_newifi-d2.yml index ef4fc66..e5eccba 100644 --- a/.github/workflows/AutoBuild-d-team_newifi-d2.yml +++ b/.github/workflows/AutoBuild-d-team_newifi-d2.yml @@ -101,17 +101,10 @@ jobs: - name: Run AutoBuild_DiyScript.sh run: | - #!/bin/bash chmod +x Scripts/AutoBuild_*.sh cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE openwrt/.config cd openwrt - egrep -v "^#|LEVEL|DEFAULT|=[0-9]" .config | grep "CONFIG_PACKAGE" | sed '/^\s*$/d' | while read X;do - line=$(grep -n "${X}" .config | cut -d ':' -f1) - [[ ! ${X} =~ '=' || -z $(echo ${X} | cut -d '=' -f2) || ! $(echo ${X} | cut -d '=' -f2) =~ [nym] ]] && { - echo "ERROR in line ${line}: ${X}" - } - done - make defconfig + make defconfig > /dev/null 2>&1 source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh Firmware-Diy_Main diff --git a/.github/workflows/AutoBuild-redmi_ax6.yml b/.github/workflows/AutoBuild-redmi_ax6.yml index d96641f..04a1e1e 100644 --- a/.github/workflows/AutoBuild-redmi_ax6.yml +++ b/.github/workflows/AutoBuild-redmi_ax6.yml @@ -101,17 +101,10 @@ jobs: - name: Run AutoBuild_DiyScript.sh run: | - #!/bin/bash chmod +x Scripts/AutoBuild_*.sh cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE openwrt/.config cd openwrt - egrep -v "^#|LEVEL|DEFAULT|=[0-9]" .config | grep "CONFIG_PACKAGE" | sed '/^\s*$/d' | while read X;do - line=$(grep -n "${X}" .config | cut -d ':' -f1) - [[ ! ${X} =~ '=' || -z $(echo ${X} | cut -d '=' -f2) || ! $(echo ${X} | cut -d '=' -f2) =~ [nym] ]] && { - echo "ERROR in line ${line}: ${X}" - } - done - make defconfig + make defconfig > /dev/null 2>&1 source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh Firmware-Diy_Main diff --git a/.github/workflows/AutoBuild-x86_64.yml b/.github/workflows/AutoBuild-x86_64.yml index c9433cf..811e321 100644 --- a/.github/workflows/AutoBuild-x86_64.yml +++ b/.github/workflows/AutoBuild-x86_64.yml @@ -101,17 +101,10 @@ jobs: - name: Run AutoBuild_DiyScript.sh run: | - #!/bin/bash chmod +x Scripts/AutoBuild_*.sh cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE openwrt/.config cd openwrt - egrep -v "^#|LEVEL|DEFAULT|=[0-9]" .config | grep "CONFIG_PACKAGE" | sed '/^\s*$/d' | while read X;do - line=$(grep -n "${X}" .config | cut -d ':' -f1) - [[ ! ${X} =~ '=' || -z $(echo ${X} | cut -d '=' -f2) || ! $(echo ${X} | cut -d '=' -f2) =~ [nym] ]] && { - echo "ERROR in line ${line}: ${X}" - } - done - make defconfig + make defconfig > /dev/null 2>&1 source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh Firmware-Diy_Main diff --git a/.github/workflows/AutoBuild-xiaomi_redmi-router-ac2100.yml b/.github/workflows/AutoBuild-xiaomi_redmi-router-ac2100.yml index 81589e5..a90ae81 100644 --- a/.github/workflows/AutoBuild-xiaomi_redmi-router-ac2100.yml +++ b/.github/workflows/AutoBuild-xiaomi_redmi-router-ac2100.yml @@ -101,17 +101,10 @@ jobs: - name: Run AutoBuild_DiyScript.sh run: | - #!/bin/bash chmod +x Scripts/AutoBuild_*.sh cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE openwrt/.config cd openwrt - egrep -v "^#|LEVEL|DEFAULT|=[0-9]" .config | grep "CONFIG_PACKAGE" | sed '/^\s*$/d' | while read X;do - line=$(grep -n "${X}" .config | cut -d ':' -f1) - [[ ! ${X} =~ '=' || -z $(echo ${X} | cut -d '=' -f2) || ! $(echo ${X} | cut -d '=' -f2) =~ [nym] ]] && { - echo "ERROR in line ${line}: ${X}" - } - done - make defconfig + make defconfig > /dev/null 2>&1 source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh Firmware-Diy_Main diff --git a/.github/workflows/AutoBuild-xiaoyu_xy-c5.yml b/.github/workflows/AutoBuild-xiaoyu_xy-c5.yml index 618454b..5f97116 100644 --- a/.github/workflows/AutoBuild-xiaoyu_xy-c5.yml +++ b/.github/workflows/AutoBuild-xiaoyu_xy-c5.yml @@ -101,17 +101,10 @@ jobs: - name: Run AutoBuild_DiyScript.sh run: | - #!/bin/bash chmod +x Scripts/AutoBuild_*.sh cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE openwrt/.config cd openwrt - egrep -v "^#|LEVEL|DEFAULT|=[0-9]" .config | grep "CONFIG_PACKAGE" | sed '/^\s*$/d' | while read X;do - line=$(grep -n "${X}" .config | cut -d ':' -f1) - [[ ! ${X} =~ '=' || -z $(echo ${X} | cut -d '=' -f2) || ! $(echo ${X} | cut -d '=' -f2) =~ [nym] ]] && { - echo "ERROR in line ${line}: ${X}" - } - done - make defconfig + make defconfig > /dev/null 2>&1 source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh Firmware-Diy_Main