From 93692e2520bfff7a6a02186c6b894bd4cfc403fd Mon Sep 17 00:00:00 2001 From: Hyy2001X <1804430051@qq.com> Date: Sat, 10 Jul 2021 10:22:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=20AutoBuild=5FFunction.sh=20?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/AutoBuild-Test.yml | 30 ++++++++-------- .../workflows/AutoBuild-asus_rt-acrh17.yml | 34 +++++++++---------- .../workflows/AutoBuild-d-team_newifi-d2.yml | 32 ++++++++--------- .github/workflows/AutoBuild-redmi_ax6.yml | 31 ++++++++--------- .github/workflows/AutoBuild-x86_64.yml | 32 ++++++++--------- .../AutoBuild-xiaomi_redmi-router-ac2100.yml | 32 ++++++++--------- .github/workflows/AutoBuild-xiaoyu_xy-c5.yml | 32 ++++++++--------- Scripts/AutoUpdate.sh | 2 +- 8 files changed, 106 insertions(+), 119 deletions(-) diff --git a/.github/workflows/AutoBuild-Test.yml b/.github/workflows/AutoBuild-Test.yml index f06f688..3d95089 100644 --- a/.github/workflows/AutoBuild-Test.yml +++ b/.github/workflows/AutoBuild-Test.yml @@ -4,9 +4,9 @@ # Author: Hyy2001X # ########################################################### -name: AutoBuild-Test +name: Test_Workflow -### 以下内容请保持不变 (修改 环境变量设置 中的信息) +### 以下内容请保持不变 (请修改下方: 环境变量设置) on: repository_dispatch: workflow_dispatch: @@ -15,8 +15,8 @@ on: description: 'SSH 连接到 Actions' required: true default: 'false' - TARGET_PROFILE: - description: '设备名称 (获取方法参考 README)' + CONFIG_FILE: + description: '调用的 [.config] 文件名称' default: 'x86_64' DEFAULT_SOURCE: description: '源码:分支 [必选]' @@ -51,13 +51,13 @@ jobs: - name: Initialization Define Info run: | - TARGET_PROFILE=${{ github.event.inputs.TARGET_PROFILE }} + CONFIG_FILE=${{ github.event.inputs.CONFIG_FILE }} DEFAULT_SOURCE=${{ github.event.inputs.DEFAULT_SOURCE }} DELETE_USELESS_FILES=${{ github.event.inputs.DELETE_USELESS_FILES }} - echo "TARGET_PROFILE=$TARGET_PROFILE" >> $GITHUB_ENV + echo "CONFIG_FILE=$CONFIG_FILE" >> $GITHUB_ENV echo "DELETE_USELESS_FILES=$DELETE_USELESS_FILES" >> $GITHUB_ENV - [ ! -f "$GITHUB_WORKSPACE/Configs/$TARGET_PROFILE" ] && { - echo "[ERROR] config-file [/Config/$TARGET_PROFILE] is not detected!" + [ ! -f "$GITHUB_WORKSPACE/Configs/$CONFIG_FILE" ] && { + echo "Config_File: [/Config/$CONFIG_FILE] is not detected!" exit 1 } export REPO_URL="https://github.com/$(echo $DEFAULT_SOURCE | cut -d \: -f 1)" @@ -65,7 +65,6 @@ jobs: [ -z $REPO_BRANCH ] && REPO_BRANCH=master echo "REPO_URL=$REPO_URL" >> $GITHUB_ENV echo "REPO_BRANCH=$REPO_BRANCH" >> $GITHUB_ENV - echo -e "TARGET_PROFILE: $TARGET_PROFILE\nSOURCE: $REPO_URL:$REPO_BRANCH" - name: Initialization Environment env: @@ -77,7 +76,6 @@ jobs: sudo mkdir -p /workdir sudo chown $USER:$GROUPS /workdir if [ "$DELETE_USELESS_FILES" == true ];then - echo "Deleting useless files,please wait ..." docker rmi $(docker images -q) sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php sudo -E apt-get -y autoremove --purge @@ -85,8 +83,8 @@ jobs: fi echo "Compile_Date=$(date +%Y%m%d%H%M)" > $GITHUB_WORKSPACE/Openwrt.info echo "Display_Date=$(date +%Y/%m/%d)" >> $GITHUB_WORKSPACE/Openwrt.info - echo "Defined_IP_Address=${{ github.event.inputs.IP }}" >> $GITHUB_WORKSPACE/Openwrt.info - echo "Openwrt_Repo=$REPO_URL" >> $GITHUB_WORKSPACE/Openwrt.info + echo "Before_IP_Address=${{ github.event.inputs.IP }}" >> $GITHUB_WORKSPACE/Openwrt.info + echo "Openwrt_Repository=$REPO_URL" >> $GITHUB_WORKSPACE/Openwrt.info echo "Artifacts_Date=$(date +%m%d%H%M)" >> $GITHUB_ENV touch Release_info @@ -101,14 +99,14 @@ jobs: - name: Run AutoBuild_DiyScript.sh run: | chmod +x Scripts/AutoBuild_*.sh - cp $GITHUB_WORKSPACE/Configs/$TARGET_PROFILE openwrt/.config + cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE openwrt/.config cd openwrt make defconfig > /dev/null 2>&1 source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh Firmware-Diy_Base source $GITHUB_WORKSPACE/openwrt/VARIABLE_FILE_Sec && Firmware-Diy - rm -f .config && cp $GITHUB_WORKSPACE/Configs/$TARGET_PROFILE .config + rm -f .config && cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config - name: SSH Connection to Actions uses: P3TERX/ssh2actions@v1.0.0 @@ -139,14 +137,14 @@ jobs: uses: actions/upload-artifact@main if: env.UPLOAD_ARTIFACTS == 'true' && env.Compile_Result == 'true' && !cancelled() with: - name: ${{ env.TARGET_PROFILE }}_${{ env.REPO_BRANCH }}_firmware_${{ env.Artifacts_Date }} + name: ${{ env.REPO_BRANCH }}_firmware_${{ env.Artifacts_Date }} path: openwrt/bin/Firmware - name: Upload bin to Artifacts uses: actions/upload-artifact@main if: env.UPLOAD_BIN_ARTIFACTS == 'true' && env.Compile_Result == 'true' && !cancelled() with: - name: ${{ env.TARGET_PROFILE }}_${{ env.REPO_BRANCH }}_bin_${{ env.Artifacts_Date }} + name: ${{ env.REPO_BRANCH }}_bin_${{ env.Artifacts_Date }} path: openwrt/bin - name: Upload Firmware to Github Releases diff --git a/.github/workflows/AutoBuild-asus_rt-acrh17.yml b/.github/workflows/AutoBuild-asus_rt-acrh17.yml index 07250e0..66abc28 100644 --- a/.github/workflows/AutoBuild-asus_rt-acrh17.yml +++ b/.github/workflows/AutoBuild-asus_rt-acrh17.yml @@ -4,9 +4,9 @@ # Author: Hyy2001X # ########################################################### -name: AutoBuild-asus_rt-acrh17 +name: asus_rt-acrh17 -### 以下内容请保持不变 +### 以下内容请保持不变 (请修改下方: 环境变量设置) on: repository_dispatch: workflow_dispatch: @@ -28,8 +28,8 @@ on: ### 环境变量设置 env: -# 设备名称 - DEFAULT_TARGET: asus_rt-acrh17 +# 编译时调用的 [.config] 文件名称 + CONFIG_FILE: asus_rt-acrh17 # 源码仓库:分支 DEFAULT_SOURCE: coolsnowwolf/lede:master # 上传固件到 Github Releases @@ -38,14 +38,14 @@ env: UPLOAD_ARTIFACTS: false # 上传 bin 文件夹到 Github Artifacts UPLOAD_BIN_ARTIFACTS: false -# 删除无用文件以释放更多空间 +# 删除无用文件以增加编译空间 DELETE_USELESS_FILES: true # 删除早期的 workflow 任务 DELETE_OLD_WORKFLOW: true ### END jobs: - Compile: + build: runs-on: ubuntu-latest steps: @@ -54,13 +54,13 @@ jobs: - name: Initialization Define Info run: | - DEFAULT_TARGET=${{ env.DEFAULT_TARGET }} + CONFIG_FILE=${{ env.CONFIG_FILE }} DEFAULT_SOURCE=${{ env.DEFAULT_SOURCE }} DELETE_USELESS_FILES=${{ env.DELETE_USELESS_FILES }} - echo "DEFAULT_TARGET=$DEFAULT_TARGET" >> $GITHUB_ENV + echo "CONFIG_FILE=$CONFIG_FILE" >> $GITHUB_ENV echo "DELETE_USELESS_FILES=$DELETE_USELESS_FILES" >> $GITHUB_ENV - [ ! -f "$GITHUB_WORKSPACE/Configs/$DEFAULT_TARGET" ] && { - echo "[ERROR] No target_config file: [$DEFAULT_TARGET] detected!" + [ ! -f "$GITHUB_WORKSPACE/Configs/$CONFIG_FILE" ] && { + echo "Config_File: [/Config/$CONFIG_FILE] is not detected!" exit 1 } export REPO_URL="https://github.com/$(echo $DEFAULT_SOURCE | cut -d \: -f 1)" @@ -68,7 +68,6 @@ jobs: [ -z $REPO_BRANCH ] && REPO_BRANCH=master echo "REPO_URL=$REPO_URL" >> $GITHUB_ENV echo "REPO_BRANCH=$REPO_BRANCH" >> $GITHUB_ENV - echo -e "TARGET_PROFILE: $DEFAULT_TARGET\nSOURCE: $REPO_URL:$REPO_BRANCH" - name: Initialization Environment env: @@ -80,7 +79,6 @@ jobs: sudo mkdir -p /workdir sudo chown $USER:$GROUPS /workdir if [ "$DELETE_USELESS_FILES" == true ];then - echo "Deleting useless files,please wait ..." docker rmi $(docker images -q) sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php sudo -E apt-get -y autoremove --purge @@ -88,8 +86,8 @@ jobs: fi echo "Compile_Date=$(date +%Y%m%d%H%M)" > $GITHUB_WORKSPACE/Openwrt.info echo "Display_Date=$(date +%Y/%m/%d)" >> $GITHUB_WORKSPACE/Openwrt.info - echo "Defined_IP_Address=${{ github.event.inputs.IP }}" >> $GITHUB_WORKSPACE/Openwrt.info - echo "Openwrt_Repo=$REPO_URL" >> $GITHUB_WORKSPACE/Openwrt.info + echo "Before_IP_Address=${{ github.event.inputs.IP }}" >> $GITHUB_WORKSPACE/Openwrt.info + echo "Openwrt_Repository=$REPO_URL" >> $GITHUB_WORKSPACE/Openwrt.info echo "Artifacts_Date=$(date +%m%d%H%M)" >> $GITHUB_ENV touch Release_info @@ -104,14 +102,14 @@ jobs: - name: Run AutoBuild_DiyScript.sh run: | chmod +x Scripts/AutoBuild_*.sh - cp $GITHUB_WORKSPACE/Configs/$DEFAULT_TARGET openwrt/.config + cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE openwrt/.config cd openwrt make defconfig > /dev/null 2>&1 source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh Firmware-Diy_Base source $GITHUB_WORKSPACE/openwrt/VARIABLE_FILE_Sec && Firmware-Diy - rm -f .config && cp $GITHUB_WORKSPACE/Configs/$DEFAULT_TARGET .config + rm -f .config && cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config - name: Compile run: | @@ -135,14 +133,14 @@ jobs: uses: actions/upload-artifact@main if: env.UPLOAD_ARTIFACTS == 'true' && env.Compile_Result == 'true' && !cancelled() with: - name: ${{ env.DEFAULT_TARGET }}_${{ env.REPO_BRANCH }}_firmware_${{ env.Artifacts_Date }} + name: ${{ env.REPO_BRANCH }}_firmware_${{ env.Artifacts_Date }} path: openwrt/bin/Firmware - name: Upload bin to Artifacts uses: actions/upload-artifact@main if: env.UPLOAD_BIN_ARTIFACTS == 'true' && env.Compile_Result == 'true' && !cancelled() with: - name: ${{ env.DEFAULT_TARGET }}_${{ env.REPO_BRANCH }}_bin_${{ env.Artifacts_Date }} + name: ${{ env.REPO_BRANCH }}_bin_${{ env.Artifacts_Date }} path: openwrt/bin - name: Upload Firmware to Github Releases diff --git a/.github/workflows/AutoBuild-d-team_newifi-d2.yml b/.github/workflows/AutoBuild-d-team_newifi-d2.yml index 8f6e17f..6c550da 100644 --- a/.github/workflows/AutoBuild-d-team_newifi-d2.yml +++ b/.github/workflows/AutoBuild-d-team_newifi-d2.yml @@ -4,9 +4,9 @@ # Author: Hyy2001X # ########################################################### -name: AutoBuild-d-team_newifi-d2 +name: d-team_newifi-d2 -### 以下内容请保持不变 (修改 环境变量设置 中的信息) +### 以下内容请保持不变 (请修改下方: 环境变量设置) on: repository_dispatch: workflow_dispatch: @@ -28,8 +28,8 @@ on: ### 环境变量设置 env: -# 设备名称 (可在 README 中找到获取方法) - TARGET_PROFILE: d-team_newifi-d2 +# 编译时调用的 [.config] 文件名称 + CONFIG_FILE: d-team_newifi-d2 # 源码仓库:分支 DEFAULT_SOURCE: coolsnowwolf/lede:master # 上传固件到 Github Releases @@ -38,7 +38,7 @@ env: UPLOAD_ARTIFACTS: false # 上传 bin 文件夹到 Github Artifacts UPLOAD_BIN_ARTIFACTS: false -# 删除无用文件以释放更多空间 +# 删除无用文件以增加编译空间 DELETE_USELESS_FILES: true # 删除早期的 workflow 任务 DELETE_OLD_WORKFLOW: true @@ -54,13 +54,13 @@ jobs: - name: Initialization Define Info run: | - TARGET_PROFILE=${{ env.TARGET_PROFILE }} + CONFIG_FILE=${{ env.CONFIG_FILE }} DEFAULT_SOURCE=${{ env.DEFAULT_SOURCE }} DELETE_USELESS_FILES=${{ env.DELETE_USELESS_FILES }} - echo "TARGET_PROFILE=$TARGET_PROFILE" >> $GITHUB_ENV + echo "CONFIG_FILE=$CONFIG_FILE" >> $GITHUB_ENV echo "DELETE_USELESS_FILES=$DELETE_USELESS_FILES" >> $GITHUB_ENV - [ ! -f "$GITHUB_WORKSPACE/Configs/$TARGET_PROFILE" ] && { - echo "[ERROR] config-file [/Config/$TARGET_PROFILE] is not detected!" + [ ! -f "$GITHUB_WORKSPACE/Configs/$CONFIG_FILE" ] && { + echo "Config_File: [/Config/$CONFIG_FILE] is not detected!" exit 1 } export REPO_URL="https://github.com/$(echo $DEFAULT_SOURCE | cut -d \: -f 1)" @@ -68,7 +68,6 @@ jobs: [ -z $REPO_BRANCH ] && REPO_BRANCH=master echo "REPO_URL=$REPO_URL" >> $GITHUB_ENV echo "REPO_BRANCH=$REPO_BRANCH" >> $GITHUB_ENV - echo -e "TARGET_PROFILE: $TARGET_PROFILE\nSOURCE: $REPO_URL:$REPO_BRANCH" - name: Initialization Environment env: @@ -80,7 +79,6 @@ jobs: sudo mkdir -p /workdir sudo chown $USER:$GROUPS /workdir if [ "$DELETE_USELESS_FILES" == true ];then - echo "Deleting useless files,please wait ..." docker rmi $(docker images -q) sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php sudo -E apt-get -y autoremove --purge @@ -88,8 +86,8 @@ jobs: fi echo "Compile_Date=$(date +%Y%m%d%H%M)" > $GITHUB_WORKSPACE/Openwrt.info echo "Display_Date=$(date +%Y/%m/%d)" >> $GITHUB_WORKSPACE/Openwrt.info - echo "Defined_IP_Address=${{ github.event.inputs.IP }}" >> $GITHUB_WORKSPACE/Openwrt.info - echo "Openwrt_Repo=$REPO_URL" >> $GITHUB_WORKSPACE/Openwrt.info + echo "Before_IP_Address=${{ github.event.inputs.IP }}" >> $GITHUB_WORKSPACE/Openwrt.info + echo "Openwrt_Repository=$REPO_URL" >> $GITHUB_WORKSPACE/Openwrt.info echo "Artifacts_Date=$(date +%m%d%H%M)" >> $GITHUB_ENV touch Release_info @@ -104,14 +102,14 @@ jobs: - name: Run AutoBuild_DiyScript.sh run: | chmod +x Scripts/AutoBuild_*.sh - cp $GITHUB_WORKSPACE/Configs/$TARGET_PROFILE openwrt/.config + cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE openwrt/.config cd openwrt make defconfig > /dev/null 2>&1 source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh Firmware-Diy_Base source $GITHUB_WORKSPACE/openwrt/VARIABLE_FILE_Sec && Firmware-Diy - rm -f .config && cp $GITHUB_WORKSPACE/Configs/$TARGET_PROFILE .config + rm -f .config && cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config - name: Compile run: | @@ -135,14 +133,14 @@ jobs: uses: actions/upload-artifact@main if: env.UPLOAD_ARTIFACTS == 'true' && env.Compile_Result == 'true' && !cancelled() with: - name: ${{ env.TARGET_PROFILE }}_${{ env.REPO_BRANCH }}_firmware_${{ env.Artifacts_Date }} + name: ${{ env.REPO_BRANCH }}_firmware_${{ env.Artifacts_Date }} path: openwrt/bin/Firmware - name: Upload bin to Artifacts uses: actions/upload-artifact@main if: env.UPLOAD_BIN_ARTIFACTS == 'true' && env.Compile_Result == 'true' && !cancelled() with: - name: ${{ env.TARGET_PROFILE }}_${{ env.REPO_BRANCH }}_bin_${{ env.Artifacts_Date }} + name: ${{ env.REPO_BRANCH }}_bin_${{ env.Artifacts_Date }} path: openwrt/bin - name: Upload Firmware to Github Releases diff --git a/.github/workflows/AutoBuild-redmi_ax6.yml b/.github/workflows/AutoBuild-redmi_ax6.yml index 7cb9f62..d07b3b8 100644 --- a/.github/workflows/AutoBuild-redmi_ax6.yml +++ b/.github/workflows/AutoBuild-redmi_ax6.yml @@ -4,9 +4,9 @@ # Author: Hyy2001X # ########################################################### -name: AutoBuild-redmi_ax6 +name: redmi_ax6 -### 以下内容请保持不变 (修改 环境变量设置 中的信息) +### 以下内容请保持不变 (请修改下方: 环境变量设置) on: repository_dispatch: workflow_dispatch: @@ -28,8 +28,8 @@ on: ### 环境变量设置 env: -# 设备名称 (可在 README 中找到获取方法) - TARGET_PROFILE: redmi_ax6 +# 编译时调用的 [.config] 文件名称 + CONFIG_FILE: redmi_ax6 # 源码仓库:分支 DEFAULT_SOURCE: coolsnowwolf/lede:master # 上传固件到 Github Releases @@ -38,14 +38,14 @@ env: UPLOAD_ARTIFACTS: false # 上传 bin 文件夹到 Github Artifacts UPLOAD_BIN_ARTIFACTS: false -# 删除无用文件以释放更多空间 +# 删除无用文件以增加编译空间 DELETE_USELESS_FILES: true # 删除早期的 workflow 任务 DELETE_OLD_WORKFLOW: true ### END jobs: - Compile: + build: runs-on: ubuntu-latest steps: @@ -54,13 +54,13 @@ jobs: - name: Initialization Define Info run: | - TARGET_PROFILE=${{ env.TARGET_PROFILE }} + CONFIG_FILE=${{ env.CONFIG_FILE }} DEFAULT_SOURCE=${{ env.DEFAULT_SOURCE }} DELETE_USELESS_FILES=${{ env.DELETE_USELESS_FILES }} - echo "TARGET_PROFILE=$TARGET_PROFILE" >> $GITHUB_ENV + echo "CONFIG_FILE=$CONFIG_FILE" >> $GITHUB_ENV echo "DELETE_USELESS_FILES=$DELETE_USELESS_FILES" >> $GITHUB_ENV - [ ! -f "$GITHUB_WORKSPACE/Configs/$TARGET_PROFILE" ] && { - echo "Config_File: [/Config/$TARGET_PROFILE] is not detected!" + [ ! -f "$GITHUB_WORKSPACE/Configs/$CONFIG_FILE" ] && { + echo "Config_File: [/Config/$CONFIG_FILE] is not detected!" exit 1 } export REPO_URL="https://github.com/$(echo $DEFAULT_SOURCE | cut -d \: -f 1)" @@ -68,7 +68,6 @@ jobs: [ -z $REPO_BRANCH ] && REPO_BRANCH=master echo "REPO_URL=$REPO_URL" >> $GITHUB_ENV echo "REPO_BRANCH=$REPO_BRANCH" >> $GITHUB_ENV - echo -e "TARGET_PROFILE: $TARGET_PROFILE\nSOURCE: $REPO_URL:$REPO_BRANCH" - name: Initialization Environment env: @@ -103,14 +102,14 @@ jobs: - name: Run AutoBuild_DiyScript.sh run: | chmod +x Scripts/AutoBuild_*.sh - cp $GITHUB_WORKSPACE/Configs/$TARGET_PROFILE openwrt/.config + cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE openwrt/.config cd openwrt make defconfig > /dev/null 2>&1 source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh Firmware-Diy_Base source $GITHUB_WORKSPACE/openwrt/VARIABLE_FILE_Sec && Firmware-Diy - rm -f .config && cp $GITHUB_WORKSPACE/Configs/$TARGET_PROFILE .config + rm -f .config && cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config - name: Compile run: | @@ -134,14 +133,14 @@ jobs: uses: actions/upload-artifact@main if: env.UPLOAD_ARTIFACTS == 'true' && env.Compile_Result == 'true' && !cancelled() with: - name: ${{ env.TARGET_PROFILE }}_${{ env.REPO_BRANCH }}_firmware_${{ env.Artifacts_Date }} + name: ${{ env.REPO_BRANCH }}_firmware_${{ env.Artifacts_Date }} path: openwrt/bin/Firmware - name: Upload bin to Artifacts uses: actions/upload-artifact@main if: env.UPLOAD_BIN_ARTIFACTS == 'true' && env.Compile_Result == 'true' && !cancelled() with: - name: ${{ env.TARGET_PROFILE }}_${{ env.REPO_BRANCH }}_bin_${{ env.Artifacts_Date }} + name: ${{ env.REPO_BRANCH }}_bin_${{ env.Artifacts_Date }} path: openwrt/bin - name: Upload Firmware to Github Releases @@ -159,4 +158,4 @@ jobs: if: env.DELETE_OLD_WORKFLOW == 'true' && !cancelled() with: retain_days: 1 - keep_minimum_runs: 3 + keep_minimum_runs: 3 \ No newline at end of file diff --git a/.github/workflows/AutoBuild-x86_64.yml b/.github/workflows/AutoBuild-x86_64.yml index b8fc4e3..4b4a9d7 100644 --- a/.github/workflows/AutoBuild-x86_64.yml +++ b/.github/workflows/AutoBuild-x86_64.yml @@ -4,9 +4,9 @@ # Author: Hyy2001X # ########################################################### -name: AutoBuild-x86_64 +name: x86_64 -### 以下内容请保持不变 (修改 环境变量设置 中的信息) +### 以下内容请保持不变 (请修改下方: 环境变量设置) on: repository_dispatch: workflow_dispatch: @@ -28,8 +28,8 @@ on: ### 环境变量设置 env: -# 设备名称 (可在 README 中找到获取方法) - TARGET_PROFILE: x86_64 +# 编译时调用的 [.config] 文件名称 + CONFIG_FILE: x86_64 # 源码仓库:分支 DEFAULT_SOURCE: coolsnowwolf/lede:master # 上传固件到 Github Releases @@ -38,7 +38,7 @@ env: UPLOAD_ARTIFACTS: false # 上传 bin 文件夹到 Github Artifacts UPLOAD_BIN_ARTIFACTS: false -# 删除无用文件以释放更多空间 +# 删除无用文件以增加编译空间 DELETE_USELESS_FILES: true # 删除早期的 workflow 任务 DELETE_OLD_WORKFLOW: true @@ -54,13 +54,13 @@ jobs: - name: Initialization Define Info run: | - TARGET_PROFILE=${{ env.TARGET_PROFILE }} + CONFIG_FILE=${{ env.CONFIG_FILE }} DEFAULT_SOURCE=${{ env.DEFAULT_SOURCE }} DELETE_USELESS_FILES=${{ env.DELETE_USELESS_FILES }} - echo "TARGET_PROFILE=$TARGET_PROFILE" >> $GITHUB_ENV + echo "CONFIG_FILE=$CONFIG_FILE" >> $GITHUB_ENV echo "DELETE_USELESS_FILES=$DELETE_USELESS_FILES" >> $GITHUB_ENV - [ ! -f "$GITHUB_WORKSPACE/Configs/$TARGET_PROFILE" ] && { - echo "[ERROR] config-file [/Config/$TARGET_PROFILE] is not detected!" + [ ! -f "$GITHUB_WORKSPACE/Configs/$CONFIG_FILE" ] && { + echo "Config_File: [/Config/$CONFIG_FILE] is not detected!" exit 1 } export REPO_URL="https://github.com/$(echo $DEFAULT_SOURCE | cut -d \: -f 1)" @@ -68,7 +68,6 @@ jobs: [ -z $REPO_BRANCH ] && REPO_BRANCH=master echo "REPO_URL=$REPO_URL" >> $GITHUB_ENV echo "REPO_BRANCH=$REPO_BRANCH" >> $GITHUB_ENV - echo -e "TARGET_PROFILE: $TARGET_PROFILE\nSOURCE: $REPO_URL:$REPO_BRANCH" - name: Initialization Environment env: @@ -80,7 +79,6 @@ jobs: sudo mkdir -p /workdir sudo chown $USER:$GROUPS /workdir if [ "$DELETE_USELESS_FILES" == true ];then - echo "Deleting useless files,please wait ..." docker rmi $(docker images -q) sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php sudo -E apt-get -y autoremove --purge @@ -88,8 +86,8 @@ jobs: fi echo "Compile_Date=$(date +%Y%m%d%H%M)" > $GITHUB_WORKSPACE/Openwrt.info echo "Display_Date=$(date +%Y/%m/%d)" >> $GITHUB_WORKSPACE/Openwrt.info - echo "Defined_IP_Address=${{ github.event.inputs.IP }}" >> $GITHUB_WORKSPACE/Openwrt.info - echo "Openwrt_Repo=$REPO_URL" >> $GITHUB_WORKSPACE/Openwrt.info + echo "Before_IP_Address=${{ github.event.inputs.IP }}" >> $GITHUB_WORKSPACE/Openwrt.info + echo "Openwrt_Repository=$REPO_URL" >> $GITHUB_WORKSPACE/Openwrt.info echo "Artifacts_Date=$(date +%m%d%H%M)" >> $GITHUB_ENV touch Release_info @@ -104,14 +102,14 @@ jobs: - name: Run AutoBuild_DiyScript.sh run: | chmod +x Scripts/AutoBuild_*.sh - cp $GITHUB_WORKSPACE/Configs/$TARGET_PROFILE openwrt/.config + cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE openwrt/.config cd openwrt make defconfig > /dev/null 2>&1 source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh Firmware-Diy_Base source $GITHUB_WORKSPACE/openwrt/VARIABLE_FILE_Sec && Firmware-Diy - rm -f .config && cp $GITHUB_WORKSPACE/Configs/$TARGET_PROFILE .config + rm -f .config && cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config - name: Compile run: | @@ -135,14 +133,14 @@ jobs: uses: actions/upload-artifact@main if: env.UPLOAD_ARTIFACTS == 'true' && env.Compile_Result == 'true' && !cancelled() with: - name: ${{ env.TARGET_PROFILE }}_${{ env.REPO_BRANCH }}_firmware_${{ env.Artifacts_Date }} + name: ${{ env.REPO_BRANCH }}_firmware_${{ env.Artifacts_Date }} path: openwrt/bin/Firmware - name: Upload bin to Artifacts uses: actions/upload-artifact@main if: env.UPLOAD_BIN_ARTIFACTS == 'true' && env.Compile_Result == 'true' && !cancelled() with: - name: ${{ env.TARGET_PROFILE }}_${{ env.REPO_BRANCH }}_bin_${{ env.Artifacts_Date }} + name: ${{ env.REPO_BRANCH }}_bin_${{ env.Artifacts_Date }} path: openwrt/bin - name: Upload Firmware to Github Releases diff --git a/.github/workflows/AutoBuild-xiaomi_redmi-router-ac2100.yml b/.github/workflows/AutoBuild-xiaomi_redmi-router-ac2100.yml index 4a4b340..ab08965 100644 --- a/.github/workflows/AutoBuild-xiaomi_redmi-router-ac2100.yml +++ b/.github/workflows/AutoBuild-xiaomi_redmi-router-ac2100.yml @@ -4,9 +4,9 @@ # Author: Hyy2001X # ########################################################### -name: AutoBuild-xiaomi_redmi-router-ac2100 +name: xiaomi_redmi-router-ac2100 -### 以下内容请保持不变 (修改 环境变量设置 中的信息) +### 以下内容请保持不变 (请修改下方: 环境变量设置) on: repository_dispatch: workflow_dispatch: @@ -28,8 +28,8 @@ on: ### 环境变量设置 env: -# 设备名称 (可在 README 中找到获取方法) - TARGET_PROFILE: xiaomi_redmi-router-ac2100 +# 编译时调用的 [.config] 文件名称 + CONFIG_FILE: xiaomi_redmi-router-ac2100 # 源码仓库:分支 DEFAULT_SOURCE: coolsnowwolf/lede:master # 上传固件到 Github Releases @@ -38,7 +38,7 @@ env: UPLOAD_ARTIFACTS: false # 上传 bin 文件夹到 Github Artifacts UPLOAD_BIN_ARTIFACTS: false -# 删除无用文件以释放更多空间 +# 删除无用文件以增加编译空间 DELETE_USELESS_FILES: true # 删除早期的 workflow 任务 DELETE_OLD_WORKFLOW: true @@ -54,13 +54,13 @@ jobs: - name: Initialization Define Info run: | - TARGET_PROFILE=${{ env.TARGET_PROFILE }} + CONFIG_FILE=${{ env.CONFIG_FILE }} DEFAULT_SOURCE=${{ env.DEFAULT_SOURCE }} DELETE_USELESS_FILES=${{ env.DELETE_USELESS_FILES }} - echo "TARGET_PROFILE=$TARGET_PROFILE" >> $GITHUB_ENV + echo "CONFIG_FILE=$CONFIG_FILE" >> $GITHUB_ENV echo "DELETE_USELESS_FILES=$DELETE_USELESS_FILES" >> $GITHUB_ENV - [ ! -f "$GITHUB_WORKSPACE/Configs/$TARGET_PROFILE" ] && { - echo "[ERROR] config-file [/Config/$TARGET_PROFILE] is not detected!" + [ ! -f "$GITHUB_WORKSPACE/Configs/$CONFIG_FILE" ] && { + echo "Config_File: [/Config/$CONFIG_FILE] is not detected!" exit 1 } export REPO_URL="https://github.com/$(echo $DEFAULT_SOURCE | cut -d \: -f 1)" @@ -68,7 +68,6 @@ jobs: [ -z $REPO_BRANCH ] && REPO_BRANCH=master echo "REPO_URL=$REPO_URL" >> $GITHUB_ENV echo "REPO_BRANCH=$REPO_BRANCH" >> $GITHUB_ENV - echo -e "TARGET_PROFILE: $TARGET_PROFILE\nSOURCE: $REPO_URL:$REPO_BRANCH" - name: Initialization Environment env: @@ -80,7 +79,6 @@ jobs: sudo mkdir -p /workdir sudo chown $USER:$GROUPS /workdir if [ "$DELETE_USELESS_FILES" == true ];then - echo "Deleting useless files,please wait ..." docker rmi $(docker images -q) sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php sudo -E apt-get -y autoremove --purge @@ -88,8 +86,8 @@ jobs: fi echo "Compile_Date=$(date +%Y%m%d%H%M)" > $GITHUB_WORKSPACE/Openwrt.info echo "Display_Date=$(date +%Y/%m/%d)" >> $GITHUB_WORKSPACE/Openwrt.info - echo "Defined_IP_Address=${{ github.event.inputs.IP }}" >> $GITHUB_WORKSPACE/Openwrt.info - echo "Openwrt_Repo=$REPO_URL" >> $GITHUB_WORKSPACE/Openwrt.info + echo "Before_IP_Address=${{ github.event.inputs.IP }}" >> $GITHUB_WORKSPACE/Openwrt.info + echo "Openwrt_Repository=$REPO_URL" >> $GITHUB_WORKSPACE/Openwrt.info echo "Artifacts_Date=$(date +%m%d%H%M)" >> $GITHUB_ENV touch Release_info @@ -104,14 +102,14 @@ jobs: - name: Run AutoBuild_DiyScript.sh run: | chmod +x Scripts/AutoBuild_*.sh - cp $GITHUB_WORKSPACE/Configs/$TARGET_PROFILE openwrt/.config + cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE openwrt/.config cd openwrt make defconfig > /dev/null 2>&1 source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh Firmware-Diy_Base source $GITHUB_WORKSPACE/openwrt/VARIABLE_FILE_Sec && Firmware-Diy - rm -f .config && cp $GITHUB_WORKSPACE/Configs/$TARGET_PROFILE .config + rm -f .config && cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config - name: Compile run: | @@ -135,14 +133,14 @@ jobs: uses: actions/upload-artifact@main if: env.UPLOAD_ARTIFACTS == 'true' && env.Compile_Result == 'true' && !cancelled() with: - name: ${{ env.TARGET_PROFILE }}_${{ env.REPO_BRANCH }}_firmware_${{ env.Artifacts_Date }} + name: ${{ env.REPO_BRANCH }}_firmware_${{ env.Artifacts_Date }} path: openwrt/bin/Firmware - name: Upload bin to Artifacts uses: actions/upload-artifact@main if: env.UPLOAD_BIN_ARTIFACTS == 'true' && env.Compile_Result == 'true' && !cancelled() with: - name: ${{ env.TARGET_PROFILE }}_${{ env.REPO_BRANCH }}_bin_${{ env.Artifacts_Date }} + name: ${{ env.REPO_BRANCH }}_bin_${{ env.Artifacts_Date }} path: openwrt/bin - name: Upload Firmware to Github Releases diff --git a/.github/workflows/AutoBuild-xiaoyu_xy-c5.yml b/.github/workflows/AutoBuild-xiaoyu_xy-c5.yml index 684b930..ade6775 100644 --- a/.github/workflows/AutoBuild-xiaoyu_xy-c5.yml +++ b/.github/workflows/AutoBuild-xiaoyu_xy-c5.yml @@ -4,9 +4,9 @@ # Author: Hyy2001X # ########################################################### -name: AutoBuild-xiaoyu_xy-c5 +name: xiaoyu_xy-c5 -### 以下内容请保持不变 (修改 环境变量设置 中的信息) +### 以下内容请保持不变 (请修改下方: 环境变量设置) on: repository_dispatch: workflow_dispatch: @@ -28,8 +28,8 @@ on: ### 环境变量设置 env: -# 设备名称 (可在 README 中找到获取方法) - TARGET_PROFILE: xiaoyu_xy-c5 +# 编译时调用的 [.config] 文件名称 + CONFIG_FILE: xiaoyu_xy-c5 # 源码仓库:分支 DEFAULT_SOURCE: coolsnowwolf/lede:master # 上传固件到 Github Releases @@ -38,7 +38,7 @@ env: UPLOAD_ARTIFACTS: false # 上传 bin 文件夹到 Github Artifacts UPLOAD_BIN_ARTIFACTS: false -# 删除无用文件以释放更多空间 +# 删除无用文件以增加编译空间 DELETE_USELESS_FILES: true # 删除早期的 workflow 任务 DELETE_OLD_WORKFLOW: true @@ -54,13 +54,13 @@ jobs: - name: Initialization Define Info run: | - TARGET_PROFILE=${{ env.TARGET_PROFILE }} + CONFIG_FILE=${{ env.CONFIG_FILE }} DEFAULT_SOURCE=${{ env.DEFAULT_SOURCE }} DELETE_USELESS_FILES=${{ env.DELETE_USELESS_FILES }} - echo "TARGET_PROFILE=$TARGET_PROFILE" >> $GITHUB_ENV + echo "CONFIG_FILE=$CONFIG_FILE" >> $GITHUB_ENV echo "DELETE_USELESS_FILES=$DELETE_USELESS_FILES" >> $GITHUB_ENV - [ ! -f "$GITHUB_WORKSPACE/Configs/$TARGET_PROFILE" ] && { - echo "[ERROR] config-file [/Config/$TARGET_PROFILE] is not detected!" + [ ! -f "$GITHUB_WORKSPACE/Configs/$CONFIG_FILE" ] && { + echo "Config_File: [/Config/$CONFIG_FILE] is not detected!" exit 1 } export REPO_URL="https://github.com/$(echo $DEFAULT_SOURCE | cut -d \: -f 1)" @@ -68,7 +68,6 @@ jobs: [ -z $REPO_BRANCH ] && REPO_BRANCH=master echo "REPO_URL=$REPO_URL" >> $GITHUB_ENV echo "REPO_BRANCH=$REPO_BRANCH" >> $GITHUB_ENV - echo -e "TARGET_PROFILE: $TARGET_PROFILE\nSOURCE: $REPO_URL:$REPO_BRANCH" - name: Initialization Environment env: @@ -80,7 +79,6 @@ jobs: sudo mkdir -p /workdir sudo chown $USER:$GROUPS /workdir if [ "$DELETE_USELESS_FILES" == true ];then - echo "Deleting useless files,please wait ..." docker rmi $(docker images -q) sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php sudo -E apt-get -y autoremove --purge @@ -88,8 +86,8 @@ jobs: fi echo "Compile_Date=$(date +%Y%m%d%H%M)" > $GITHUB_WORKSPACE/Openwrt.info echo "Display_Date=$(date +%Y/%m/%d)" >> $GITHUB_WORKSPACE/Openwrt.info - echo "Defined_IP_Address=${{ github.event.inputs.IP }}" >> $GITHUB_WORKSPACE/Openwrt.info - echo "Openwrt_Repo=$REPO_URL" >> $GITHUB_WORKSPACE/Openwrt.info + echo "Before_IP_Address=${{ github.event.inputs.IP }}" >> $GITHUB_WORKSPACE/Openwrt.info + echo "Openwrt_Repository=$REPO_URL" >> $GITHUB_WORKSPACE/Openwrt.info echo "Artifacts_Date=$(date +%m%d%H%M)" >> $GITHUB_ENV touch Release_info @@ -104,14 +102,14 @@ jobs: - name: Run AutoBuild_DiyScript.sh run: | chmod +x Scripts/AutoBuild_*.sh - cp $GITHUB_WORKSPACE/Configs/$TARGET_PROFILE openwrt/.config + cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE openwrt/.config cd openwrt make defconfig > /dev/null 2>&1 source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh Firmware-Diy_Base source $GITHUB_WORKSPACE/openwrt/VARIABLE_FILE_Sec && Firmware-Diy - rm -f .config && cp $GITHUB_WORKSPACE/Configs/$TARGET_PROFILE .config + rm -f .config && cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config - name: Compile run: | @@ -135,14 +133,14 @@ jobs: uses: actions/upload-artifact@main if: env.UPLOAD_ARTIFACTS == 'true' && env.Compile_Result == 'true' && !cancelled() with: - name: ${{ env.TARGET_PROFILE }}_${{ env.REPO_BRANCH }}_firmware_${{ env.Artifacts_Date }} + name: ${{ env.REPO_BRANCH }}_firmware_${{ env.Artifacts_Date }} path: openwrt/bin/Firmware - name: Upload bin to Artifacts uses: actions/upload-artifact@main if: env.UPLOAD_BIN_ARTIFACTS == 'true' && env.Compile_Result == 'true' && !cancelled() with: - name: ${{ env.TARGET_PROFILE }}_${{ env.REPO_BRANCH }}_bin_${{ env.Artifacts_Date }} + name: ${{ env.REPO_BRANCH }}_bin_${{ env.Artifacts_Date }} path: openwrt/bin - name: Upload Firmware to Github Releases diff --git a/Scripts/AutoUpdate.sh b/Scripts/AutoUpdate.sh index db8191f..b93aba7 100755 --- a/Scripts/AutoUpdate.sh +++ b/Scripts/AutoUpdate.sh @@ -59,7 +59,7 @@ SHOW_VARIABLE() { 固件作者: ${Author} 软件架构: ${TARGET_SUBTARGET} 作者仓库: ${Github} -OpenWrt 源码: https://github.com/${Openwrt_Maintainer}/${Openwrt_Repo_Name}:${Openwrt_Branch} +OpenWrt 源码: https://github.com/${Openwrt_Maintainer}/${OP_REPO_NAME}:${OP_BRANCH} Release API: ${Github_API} 固件格式-框架: $(GET_VARIABLE AutoBuild_Firmware ${Default_Variable}) 固件名称-框架: $(GET_VARIABLE Egrep_Firmware ${Default_Variable})