From 382c3c1e6cae6ac4b180818e40f4739ea47cc8cf Mon Sep 17 00:00:00 2001 From: Hyy2001X <1804430051@qq.com> Date: Sat, 13 Jan 2024 23:43:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...acrh17.yml => AutoBuild-asus_rt-ac42u.yml} | 17 ++- .../workflows/AutoBuild-d-team_newifi-d2.yml | 13 +- .../workflows/AutoBuild-p2w_r619ac-128m.yml | 13 +- .github/workflows/AutoBuild-x86_64.yml | 13 +- .../AutoBuild-xiaomi_redmi-router-ac2100.yml | 15 ++- .../AutoBuild-xiaomi_redmi-router-ax6s.yml | 13 +- .github/workflows/AutoBuild-xiaoyu_xy-c5.yml | 116 +++++++++++------- .github/workflows/Module-Refresh_API.yml | 4 +- Configs/{asus_rt-acrh17 => asus_rt-ac42u} | 3 + Configs/d-team_newifi-d2 | 3 + Configs/p2w_r619ac-128m | 3 + Configs/x86_64 | 3 + Configs/xiaomi_redmi-router-ac2100 | 3 + Configs/xiaomi_redmi-router-ax6s | 3 + Configs/xiaoyu_xy-c5 | 3 + Configs/xiaoyu_xy-c5-Clash | 3 - .../Depends/openwrt_release_padavanonly | 7 ++ LICENSE | 2 +- README.md | 25 +--- Scripts/AutoBuild_DiyScript.sh | 2 - Scripts/AutoBuild_Function.sh | 37 ++++-- 21 files changed, 193 insertions(+), 108 deletions(-) rename .github/workflows/{AutoBuild-asus_rt-acrh17.yml => AutoBuild-asus_rt-ac42u.yml} (95%) rename Configs/{asus_rt-acrh17 => asus_rt-ac42u} (59%) delete mode 100644 Configs/xiaoyu_xy-c5-Clash create mode 100644 CustomFiles/Depends/openwrt_release_padavanonly diff --git a/.github/workflows/AutoBuild-asus_rt-acrh17.yml b/.github/workflows/AutoBuild-asus_rt-ac42u.yml similarity index 95% rename from .github/workflows/AutoBuild-asus_rt-acrh17.yml rename to .github/workflows/AutoBuild-asus_rt-ac42u.yml index fa8cd8c..1091a9f 100644 --- a/.github/workflows/AutoBuild-asus_rt-acrh17.yml +++ b/.github/workflows/AutoBuild-asus_rt-ac42u.yml @@ -4,9 +4,9 @@ # Author: Hyy2001X # ########################################################### -name: ASUS RT-ACRH17 +name: ASUS RT-ACRH17 (AC42U) -### 以下内容请保持不变 ( 请修改下方的 [环境变量设置] ) +### 界面控制部分 ( 以下内容请保持不变 ) on: repository_dispatch: workflow_dispatch: @@ -20,22 +20,26 @@ on: Tempoary_FLAG: description: '固件标签 [可选]' default: '' -### 控制部分结束 ( 以上内容请保持不变 ) +### 界面控制部分结束 ( 以上内容请保持不变 ) + ## Git Push 时触发编译(不要删除此行注释) #push: # branches: # - master - + + ## 定时触发编译(不要删除此行注释) #schedule: # - cron: 0 8 * * 5 - + + ## 重新点亮 Star 时触发编译(不要删除此行注释) #watch: # types: [started] +### 请按需求修改以下内容 ### 环境变量设置 env: # 编译时调用的 [.config] 文件名称 - CONFIG_FILE: asus_rt-acrh17 + CONFIG_FILE: asus_rt-ac42u # 源码仓库:分支 DEFAULT_SOURCE: coolsnowwolf/lede:master # 上传固件到 Github Releases @@ -51,6 +55,7 @@ env: # Cache 加速编译 CACHE_ACCELERATE: true ### 结束 +### 请按需求修改以上内容 jobs: Compile: diff --git a/.github/workflows/AutoBuild-d-team_newifi-d2.yml b/.github/workflows/AutoBuild-d-team_newifi-d2.yml index a67f709..4273a28 100644 --- a/.github/workflows/AutoBuild-d-team_newifi-d2.yml +++ b/.github/workflows/AutoBuild-d-team_newifi-d2.yml @@ -8,16 +8,20 @@ name: NEWIFI D2 on: repository_dispatch: + ## Git Push 时触发编译(不要删除此行注释) #push: # branches: # - master - + + ## 定时触发编译(不要删除此行注释) #schedule: # - cron: 0 8 * * 5 - + + ## 重新点亮 Star 时触发编译(不要删除此行注释) #watch: # types: [started] - + + ### 界面控制部分 ( 以下内容请保持不变, 如有需要仅修改 options 选项 ) workflow_dispatch: inputs: Tempoary_CONFIG: @@ -48,7 +52,9 @@ on: description: '上传 bin 文件夹到 Artifacts' default: 'false' type: boolean + ### 界面控制部分结束 ( 以上内容请保持不变 ) +### 请按需求修改以下内容 ### 环境变量设置 env: # 编译时调用的 [.config] 文件名称 @@ -62,6 +68,7 @@ env: # Cache 加速编译 CACHE_ACCELERATE: false ### 结束 +### 请按需求修改以上内容 jobs: Compile: diff --git a/.github/workflows/AutoBuild-p2w_r619ac-128m.yml b/.github/workflows/AutoBuild-p2w_r619ac-128m.yml index 2bf6ca8..1d4c18c 100644 --- a/.github/workflows/AutoBuild-p2w_r619ac-128m.yml +++ b/.github/workflows/AutoBuild-p2w_r619ac-128m.yml @@ -6,7 +6,7 @@ name: P&W R619AC 128M -### 以下内容请保持不变 ( 请修改下方的 [环境变量设置] ) +### 界面控制部分 ( 以下内容请保持不变 ) on: repository_dispatch: workflow_dispatch: @@ -20,18 +20,22 @@ on: Tempoary_FLAG: description: '固件标签 [可选]' default: '' -### 控制部分结束 ( 以上内容请保持不变 ) +### 界面控制部分结束 ( 以上内容请保持不变 ) + ## Git Push 时触发编译(不要删除此行注释) #push: # branches: # - master - + + ## 定时触发编译(不要删除此行注释) #schedule: # - cron: 0 8 * * 5 - + + ## 重新点亮 Star 时触发编译(不要删除此行注释) #watch: # types: [started] +### 请按需求修改以下内容 ### 环境变量设置 env: # 编译时调用的 [.config] 文件名称 @@ -51,6 +55,7 @@ env: # Cache 加速编译 CACHE_ACCELERATE: true ### 结束 +### 请按需求修改以上内容 jobs: Compile: diff --git a/.github/workflows/AutoBuild-x86_64.yml b/.github/workflows/AutoBuild-x86_64.yml index 4c8b036..1a876f0 100644 --- a/.github/workflows/AutoBuild-x86_64.yml +++ b/.github/workflows/AutoBuild-x86_64.yml @@ -8,16 +8,20 @@ name: x86_64 on: repository_dispatch: + ## Git Push 时触发编译(不要删除此行注释) #push: # branches: # - master - + + ## 定时触发编译(不要删除此行注释) #schedule: # - cron: 0 8 * * 5 - + + ## 重新点亮 Star 时触发编译(不要删除此行注释) #watch: # types: [started] - + + ### 界面控制部分 ( 以下内容请保持不变, 如有需要仅修改 options 选项 ) workflow_dispatch: inputs: Tempoary_CONFIG: @@ -48,7 +52,9 @@ on: description: '上传 bin 文件夹到 Artifacts' default: 'false' type: boolean + ### 界面控制部分结束 ( 以上内容请保持不变 ) +### 请按需求修改以下内容 ### 环境变量设置 env: # 编译时调用的 [.config] 文件名称 @@ -62,6 +68,7 @@ env: # Cache 加速编译 CACHE_ACCELERATE: false ### 结束 +### 请按需求修改以上内容 jobs: Compile: diff --git a/.github/workflows/AutoBuild-xiaomi_redmi-router-ac2100.yml b/.github/workflows/AutoBuild-xiaomi_redmi-router-ac2100.yml index f29556e..ea69275 100644 --- a/.github/workflows/AutoBuild-xiaomi_redmi-router-ac2100.yml +++ b/.github/workflows/AutoBuild-xiaomi_redmi-router-ac2100.yml @@ -6,7 +6,7 @@ name: Redmi AC2100 -### 以下内容请保持不变 ( 请修改下方的 [环境变量设置] ) +### 界面控制部分 ( 以下内容请保持不变 ) on: repository_dispatch: workflow_dispatch: @@ -20,18 +20,22 @@ on: Tempoary_FLAG: description: '固件标签 [可选]' default: '' -### 控制部分结束 ( 以上内容请保持不变 ) +### 界面控制部分结束 ( 以上内容请保持不变 ) + ## Git Push 时触发编译(不要删除此行注释) #push: # branches: # - master - + + ## 定时触发编译(不要删除此行注释) #schedule: # - cron: 0 8 * * 5 - + + ## 重新点亮 Star 时触发编译(不要删除此行注释) #watch: # types: [started] +### 请按需求修改以下内容 ### 环境变量设置 env: # 编译时调用的 [.config] 文件名称 @@ -49,8 +53,9 @@ env: # 删除早期的 workflow 任务 DELETE_OLD_WORKFLOW: false # Cache 加速编译 - CACHE_ACCELERATE: true + CACHE_ACCELERATE: false ### 结束 +### 请按需求修改以上内容 jobs: Compile: diff --git a/.github/workflows/AutoBuild-xiaomi_redmi-router-ax6s.yml b/.github/workflows/AutoBuild-xiaomi_redmi-router-ax6s.yml index 515cc46..d35376f 100644 --- a/.github/workflows/AutoBuild-xiaomi_redmi-router-ax6s.yml +++ b/.github/workflows/AutoBuild-xiaomi_redmi-router-ax6s.yml @@ -6,7 +6,7 @@ name: Redmi AX6S -### 以下内容请保持不变 ( 请修改下方的 [环境变量设置] ) +### 界面控制部分 ( 以下内容请保持不变 ) on: repository_dispatch: workflow_dispatch: @@ -20,18 +20,22 @@ on: Tempoary_FLAG: description: '固件标签 [可选]' default: '' -### 控制部分结束 ( 以上内容请保持不变 ) +### 界面控制部分结束 ( 以上内容请保持不变 ) + ## Git Push 时触发编译(不要删除此行注释) #push: # branches: # - master - + + ## 定时触发编译(不要删除此行注释) #schedule: # - cron: 0 8 * * 5 - + + ## 重新点亮 Star 时触发编译(不要删除此行注释) #watch: # types: [started] +### 请按需求修改以下内容 ### 环境变量设置 env: # 编译时调用的 [.config] 文件名称 @@ -51,6 +55,7 @@ env: # Cache 加速编译 CACHE_ACCELERATE: false ### 结束 +### 请按需求修改以上内容 jobs: Compile: diff --git a/.github/workflows/AutoBuild-xiaoyu_xy-c5.yml b/.github/workflows/AutoBuild-xiaoyu_xy-c5.yml index 2b15d07..25d5dee 100644 --- a/.github/workflows/AutoBuild-xiaoyu_xy-c5.yml +++ b/.github/workflows/AutoBuild-xiaoyu_xy-c5.yml @@ -6,51 +6,69 @@ name: Xiaoyu C5 -### 以下内容请保持不变 ( 请修改下方的 [环境变量设置] ) on: repository_dispatch: - workflow_dispatch: - inputs: - Tempoary_IP: - description: '固件 IP 地址 [可选]' - default: '' - Tempoary_CONFIG: - description: '配置文件 [可选]' - default: '' - Tempoary_FLAG: - description: '固件标签 [可选]' - default: '' -### 控制部分结束 ( 以上内容请保持不变 ) - + ## Git Push 时触发编译(不要删除此行注释) #push: # branches: # - master - + + ## 定时触发编译(不要删除此行注释) #schedule: # - cron: 0 8 * * 5 - + + ## 重新点亮 Star 时触发编译(不要删除此行注释) #watch: # types: [started] + + ### 界面控制部分 ( 以下内容请保持不变, 如有需要仅修改 options 选项 ) + workflow_dispatch: + inputs: + Tempoary_CONFIG: + description: '配置文件' + default: 'xiaoyu_xy-c5' + type: choice + options: + - 'xiaoyu_xy-c5' + Tempoary_FLAG: + description: '固件标签' + default: 'AUTO' + type: choice + options: + - 'AUTO' + - 'Full' + Tempoary_IP: + description: '固件 IP 地址 [可选]' + default: '' + UPLOAD_RELEASES: + description: '上传固件到 Releases' + default: 'true' + type: boolean + UPLOAD_ARTIFACTS: + description: '上传固件到 Artifacts' + default: 'false' + type: boolean + UPLOAD_BIN_ARTIFACTS: + description: '上传 bin 文件夹到 Artifacts' + default: 'false' + type: boolean + ### 界面控制部分结束 ( 以上内容请保持不变 ) +### 请按需求修改以下内容 ### 环境变量设置 env: # 编译时调用的 [.config] 文件名称 CONFIG_FILE: xiaoyu_xy-c5 # 源码仓库:分支 DEFAULT_SOURCE: coolsnowwolf/lede:master -# 上传固件到 Github Releases - UPLOAD_RELEASES: true -# 上传固件到 Github Artifacts - UPLOAD_ARTIFACTS: false -# 上传 bin 文件夹到 Github Artifacts - UPLOAD_BIN_ARTIFACTS: false # 删除无用文件以增加编译空间 DELETE_USELESS_FILES: true # 删除早期的 workflow 任务 DELETE_OLD_WORKFLOW: false # Cache 加速编译 - CACHE_ACCELERATE: true + CACHE_ACCELERATE: false ### 结束 +### 请按需求修改以上内容 jobs: Compile: @@ -61,15 +79,6 @@ jobs: contents: write steps: - - name: Maximize Build Space - if: env.DELETE_USELESS_FILES == 'true' && !cancelled() - uses: easimon/maximize-build-space@master - with: - root-reserve-mb: 5120 - remove-dotnet: 'true' - remove-android: 'true' - remove-haskell: 'true' - - name: Checkout uses: actions/checkout@main with: @@ -112,6 +121,23 @@ jobs: echo "REPO_BRANCH=$REPO_BRANCH" >> $GITHUB_ENV echo "Compile_Date=$(date +%Y%m%d%H%M)" >> $GITHUB_ENV echo "Display_Date=$(date +%Y/%m/%d)" >> $GITHUB_ENV + if [[ -z "${{ github.event.inputs.Tempoary_CONFIG }}" ]]; then + echo "TIMED_TRIGGER=true" >> $GITHUB_ENV + else + echo "UPLOAD_RELEASES=${{ github.event.inputs.UPLOAD_RELEASES }}" >> $GITHUB_ENV + echo "UPLOAD_ARTIFACTS=${{ github.event.inputs.UPLOAD_ARTIFACTS }}" >> $GITHUB_ENV + echo "UPLOAD_BIN_ARTIFACTS=${{ github.event.inputs.UPLOAD_BIN_ARTIFACTS }}" >> $GITHUB_ENV + fi + - name: TIMED_TRIGGER + if: env.TIMED_TRIGGER == 'true' + env: + UPLOAD_RELEASES: true + UPLOAD_ARTIFACTS: false + UPLOAD_BIN_ARTIFACTS: false + run: | + echo "UPLOAD_RELEASES=${UPLOAD_RELEASES}" >> $GITHUB_ENV + echo "UPLOAD_ARTIFACTS=${UPLOAD_ARTIFACTS}" >> $GITHUB_ENV + echo "UPLOAD_BIN_ARTIFACTS=${UPLOAD_BIN_ARTIFACTS}" >> $GITHUB_ENV - name: Initialize Environment env: @@ -182,13 +208,14 @@ jobs: make download -j8 - name: Build OpenWrt + id: compile run: | cd openwrt make -j4 || make -j1 V=s [ "$?" == 0 ] && echo "Compile_Result=true" >> $GITHUB_ENV || echo "Compile_Result=false" >> $GITHUB_ENV - name: Checkout Firmware - if: env.Compile_Result == 'true' && !cancelled() + if: steps.compile.outcome == 'success' && !cancelled() run: | cd openwrt source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh @@ -196,21 +223,21 @@ jobs: - name: Upload Firmware to Artifacts uses: actions/upload-artifact@main - if: env.UPLOAD_ARTIFACTS == 'true' && env.Compile_Result == 'true' && !cancelled() + if: env.UPLOAD_ARTIFACTS == 'true' && steps.compile.outcome == 'success' && !cancelled() with: name: ${{ env.CONFIG_FILE }}_firmware_${{ env.Compile_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() + if: env.UPLOAD_BIN_ARTIFACTS == 'true' && steps.compile.outcome == 'success' && !cancelled() with: name: ${{ env.CONFIG_FILE }}_bin_${{ env.Compile_Date }} path: openwrt/bin - name: Upload Firmware to Release uses: svenstaro/upload-release-action@v2 - if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled() + if: env.UPLOAD_RELEASES == 'true' && steps.compile.outcome == 'success' && !cancelled() with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: openwrt/bin/Firmware/* @@ -218,13 +245,13 @@ jobs: tag: AutoUpdate overwrite: true - - name: Download Github API - if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled() + - name: Refresh API (1/2) + if: env.UPLOAD_RELEASES == 'true' && steps.compile.outcome == 'success' && !cancelled() run: | wget https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API - - name: Upload Github API to Release - if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled() + - name: Refresh API (2/2) + if: env.UPLOAD_RELEASES == 'true' && steps.compile.outcome == 'success' && !cancelled() uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ secrets.GITHUB_TOKEN }} @@ -234,8 +261,11 @@ jobs: overwrite: true - name: Delete old Workflow Runs - uses: GitRML/delete-workflow-runs@main + continue-on-error: true if: env.DELETE_OLD_WORKFLOW == 'true' && !cancelled() + uses: Mattraks/delete-workflow-runs@v2 with: - retain_days: 1 - keep_minimum_runs: 3 + token: ${{ secrets.GITHUB_TOKEN }} + repository: ${{ github.repository }} + retain_days: 3 + keep_minimum_runs: 0 diff --git a/.github/workflows/Module-Refresh_API.yml b/.github/workflows/Module-Refresh_API.yml index 794dfe4..f36463a 100644 --- a/.github/workflows/Module-Refresh_API.yml +++ b/.github/workflows/Module-Refresh_API.yml @@ -13,8 +13,8 @@ on: description: '手动刷新 API' default: 'true' -# schedule: -# - cron: 0 4,16 * * * + schedule: + - cron: 0 4,16 * * * jobs: Job: diff --git a/Configs/asus_rt-acrh17 b/Configs/asus_rt-ac42u similarity index 59% rename from Configs/asus_rt-acrh17 rename to Configs/asus_rt-ac42u index 951abd3..4378d4c 100644 --- a/Configs/asus_rt-acrh17 +++ b/Configs/asus_rt-ac42u @@ -1,3 +1,6 @@ CONFIG_TARGET_ipq40xx=y CONFIG_TARGET_ipq40xx_generic=y CONFIG_TARGET_ipq40xx_generic_DEVICE_asus_rt-ac42u=y + +# CONFIG_SIGNATURE_CHECK is not set +# CONFIG_SIGNED_PACKAGES is not set diff --git a/Configs/d-team_newifi-d2 b/Configs/d-team_newifi-d2 index 8b475c2..dc1511d 100644 --- a/Configs/d-team_newifi-d2 +++ b/Configs/d-team_newifi-d2 @@ -1,3 +1,6 @@ CONFIG_TARGET_ramips=y CONFIG_TARGET_ramips_mt7621=y CONFIG_TARGET_ramips_mt7621_DEVICE_d-team_newifi-d2=y + +# CONFIG_SIGNATURE_CHECK is not set +# CONFIG_SIGNED_PACKAGES is not set diff --git a/Configs/p2w_r619ac-128m b/Configs/p2w_r619ac-128m index ac2a8da..6d95226 100644 --- a/Configs/p2w_r619ac-128m +++ b/Configs/p2w_r619ac-128m @@ -1,3 +1,6 @@ CONFIG_TARGET_ipq40xx=y CONFIG_TARGET_ipq40xx_generic=y CONFIG_TARGET_ipq40xx_generic_DEVICE_p2w_r619ac-128m=y + +# CONFIG_SIGNATURE_CHECK is not set +# CONFIG_SIGNED_PACKAGES is not set diff --git a/Configs/x86_64 b/Configs/x86_64 index 22951a4..360933f 100644 --- a/Configs/x86_64 +++ b/Configs/x86_64 @@ -14,3 +14,6 @@ CONFIG_TARGET_KERNEL_PARTSIZE=32 CONFIG_TARGET_ROOTFS_PARTSIZE=480 # CONFIG_GRUB_CONSOLE is not set CONFIG_TARGET_IMAGES_GZIP=y + +# CONFIG_SIGNATURE_CHECK is not set +# CONFIG_SIGNED_PACKAGES is not set diff --git a/Configs/xiaomi_redmi-router-ac2100 b/Configs/xiaomi_redmi-router-ac2100 index 125f5cd..ee9b22e 100644 --- a/Configs/xiaomi_redmi-router-ac2100 +++ b/Configs/xiaomi_redmi-router-ac2100 @@ -1,3 +1,6 @@ CONFIG_TARGET_ramips=y CONFIG_TARGET_ramips_mt7621=y CONFIG_TARGET_ramips_mt7621_DEVICE_xiaomi_redmi-router-ac2100=y + +# CONFIG_SIGNATURE_CHECK is not set +# CONFIG_SIGNED_PACKAGES is not set diff --git a/Configs/xiaomi_redmi-router-ax6s b/Configs/xiaomi_redmi-router-ax6s index 9e9301f..9b69c1b 100644 --- a/Configs/xiaomi_redmi-router-ax6s +++ b/Configs/xiaomi_redmi-router-ax6s @@ -1,3 +1,6 @@ CONFIG_TARGET_mediatek=y CONFIG_TARGET_mediatek_mt7622=y CONFIG_TARGET_mediatek_mt7622_DEVICE_xiaomi_redmi-router-ax6s=y + +# CONFIG_SIGNATURE_CHECK is not set +# CONFIG_SIGNED_PACKAGES is not set diff --git a/Configs/xiaoyu_xy-c5 b/Configs/xiaoyu_xy-c5 index cd39829..4164ad2 100644 --- a/Configs/xiaoyu_xy-c5 +++ b/Configs/xiaoyu_xy-c5 @@ -1,3 +1,6 @@ CONFIG_TARGET_ramips=y CONFIG_TARGET_ramips_mt7621=y CONFIG_TARGET_ramips_mt7621_DEVICE_xiaoyu_xy-c5=y + +# CONFIG_SIGNATURE_CHECK is not set +# CONFIG_SIGNED_PACKAGES is not set diff --git a/Configs/xiaoyu_xy-c5-Clash b/Configs/xiaoyu_xy-c5-Clash deleted file mode 100644 index cd39829..0000000 --- a/Configs/xiaoyu_xy-c5-Clash +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_TARGET_ramips=y -CONFIG_TARGET_ramips_mt7621=y -CONFIG_TARGET_ramips_mt7621_DEVICE_xiaoyu_xy-c5=y diff --git a/CustomFiles/Depends/openwrt_release_padavanonly b/CustomFiles/Depends/openwrt_release_padavanonly new file mode 100644 index 0000000..670ecf3 --- /dev/null +++ b/CustomFiles/Depends/openwrt_release_padavanonly @@ -0,0 +1,7 @@ +DISTRIB_ID='%D' +DISTRIB_RELEASE='%V' +DISTRIB_REVISION='' +DISTRIB_TARGET='%S' +DISTRIB_ARCH='%A' +DISTRIB_DESCRIPTION='ImmortalWrt' +DISTRIB_TAINTS='%t' \ No newline at end of file diff --git a/LICENSE b/LICENSE index 7d71615..e83c0df 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2023 Hyy2001X +Copyright (c) 2020-2024 Hyy2001X Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 0d68edb..a25d64f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # OpenWrt-Actions & One-key AutoUpdate +AutoBuild-Actions 仓库地址: [AutoBuild-Actions-BETA](https://github.com/Hyy2001X/AutoBuild-Actions-BETA) + 自用修改版软件包地址: [AutoBuild-Packages](https://github.com/Hyy2001X/AutoBuild-Packages) 支持的 OpenWrt 源码: `coolsnowwolf/lede`、`immortalwrt/immortalwrt`、`openwrt/openwrt`、`lienol/openwrt` @@ -91,7 +93,7 @@ 首先需要打开`TTYD 终端`或者使用`SSH`, 按需输入下方指令: - 常规更新固件: `autoupdate` + 更新固件: `autoupdate` 使用镜像加速更新固件: `autoupdate -P` @@ -105,29 +107,8 @@ 打印运行日志: `autoupdate --log` - 列出相关信息: `autoupdate --list` - - 检查运行环境: `autoupdate --chk` - 查看脚本帮助: `autoupdate --help` - **注意:** 部分参数可一起使用, 例如 `autoupdate -n -P -F --path /mnt/sda1` - -## 使用 tools 固件工具箱(可选) - - 打开`TTYD 终端`或者使用`SSH`, 执行指令`tools`即可启动固件工具箱 - - 当前支持以下功能: - - - USB 扩展内部空间 - - Samba 相关设置 - - 打印端口占用详细列表 - - 打印所有硬盘信息 - - 网络检查 (基础网络 | Google 连接检测) - - AutoBuild 固件环境修复 - - 系统信息监控 - - 打印在线设备列表 - ## 鸣谢 - [Lean's Openwrt Source code](https://github.com/coolsnowwolf/lede) diff --git a/Scripts/AutoBuild_DiyScript.sh b/Scripts/AutoBuild_DiyScript.sh index 7b44418..50652e5 100644 --- a/Scripts/AutoBuild_DiyScript.sh +++ b/Scripts/AutoBuild_DiyScript.sh @@ -27,9 +27,7 @@ Firmware_Diy_Core() { # 添加 AutoBuild 固件特性, true: [开启]; false: [关闭] AutoBuild_Features_Patch=false - # 保持默认 AutoBuild_Features_Kconfig=false - # 保持默认 } Firmware_Diy() { diff --git a/Scripts/AutoBuild_Function.sh b/Scripts/AutoBuild_Function.sh index abece12..45bb675 100644 --- a/Scripts/AutoBuild_Function.sh +++ b/Scripts/AutoBuild_Function.sh @@ -27,7 +27,7 @@ Firmware_Diy_Start() { zzz_Default_Version="$(egrep -o "R[0-9]+\.[0-9]+\.[0-9]+" ${Version_File})" OP_VERSION="${zzz_Default_Version}-${Compile_Date}" ;; - immortalwrt/immortalwrt) + immortalwrt/immortalwrt | padavanonly/immortalwrtARM) Version_File=package/base-files/files/etc/openwrt_release OP_VERSION="${OP_VERSION_HEAD}${Compile_Date}" ;; @@ -123,14 +123,26 @@ EOF Firmware_Diy_Main() { ECHO "[Firmware_Diy_Main] Starting ..." CD ${WORK} + cat >> ${GITHUB_ENV} <> ${CONFIG_FILE} - for i in ${GITHUB_ENV} $(PKG_Finder d package AutoBuild-Packages)/autoupdate/files/etc/autoupdate/default - do - cat >> ${i} <> $(PKG_Finder d package AutoBuild-Packages)/autoupdate/files/etc/autoupdate/default <