diff --git a/.github/workflows/AutoBuild-asus_rt-acrh17.yml b/.github/workflows/AutoBuild-asus_rt-acrh17.yml index b2d77eb..1be0dc4 100644 --- a/.github/workflows/AutoBuild-asus_rt-acrh17.yml +++ b/.github/workflows/AutoBuild-asus_rt-acrh17.yml @@ -117,28 +117,31 @@ jobs: chmod +x Scripts/AutoBuild_*.sh cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE openwrt/.config cd openwrt - make defconfig > /dev/null 2>&1 + make defconfig source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh - Firmware_Diy_Main && Firmware_Diy - rm -f .config && cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config + Firmware_Diy_Before + rm .config && cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config + Firmware_Diy_Main + Firmware_Diy - name: Compile run: | - Result=false cd openwrt - source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh && Firmware_Diy_Other - rm -rf ./tmp && ./scripts/feeds install -a > /dev/null 2>&1 + source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh + Firmware_Diy_Other + ./scripts/feeds install -a > /dev/null 2>&1 make defconfig make download -j$(nproc) make -j$(nproc) || make -j1 V=s - [ $? == 0 ] && echo "Result=true" >> $GITHUB_ENV + [ $? == 0 ] && echo "Result=true" >> $GITHUB_ENV || echo "Result=false" >> $GITHUB_ENV - name: Process Firmware if: env.Result == 'true' && !cancelled() run: | cd openwrt - source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh && Firmware_Diy_End + source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh + Firmware_Diy_End - name: Upload Firmware to Artifacts uses: actions/upload-artifact@main diff --git a/.github/workflows/AutoBuild-d-team_newifi-d2.yml b/.github/workflows/AutoBuild-d-team_newifi-d2.yml index 7cc7852..08912db 100644 --- a/.github/workflows/AutoBuild-d-team_newifi-d2.yml +++ b/.github/workflows/AutoBuild-d-team_newifi-d2.yml @@ -117,28 +117,31 @@ jobs: chmod +x Scripts/AutoBuild_*.sh cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE openwrt/.config cd openwrt - make defconfig > /dev/null 2>&1 + make defconfig source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh - Firmware_Diy_Main && Firmware_Diy - rm -f .config && cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config + Firmware_Diy_Before + rm .config && cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config + Firmware_Diy_Main + Firmware_Diy - name: Compile run: | - Result=false cd openwrt - source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh && Firmware_Diy_Other - rm -rf ./tmp && ./scripts/feeds install -a > /dev/null 2>&1 + source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh + Firmware_Diy_Other + ./scripts/feeds install -a > /dev/null 2>&1 make defconfig make download -j$(nproc) make -j$(nproc) || make -j1 V=s - [ $? == 0 ] && echo "Result=true" >> $GITHUB_ENV + [ $? == 0 ] && echo "Result=true" >> $GITHUB_ENV || echo "Result=false" >> $GITHUB_ENV - name: Process Firmware if: env.Result == 'true' && !cancelled() run: | cd openwrt - source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh && Firmware_Diy_End + source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh + Firmware_Diy_End - name: Upload Firmware to Artifacts uses: actions/upload-artifact@main diff --git a/.github/workflows/AutoBuild-p2w_r619ac-128m.yml b/.github/workflows/AutoBuild-p2w_r619ac-128m.yml index 86bd235..41ada5e 100644 --- a/.github/workflows/AutoBuild-p2w_r619ac-128m.yml +++ b/.github/workflows/AutoBuild-p2w_r619ac-128m.yml @@ -117,28 +117,31 @@ jobs: chmod +x Scripts/AutoBuild_*.sh cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE openwrt/.config cd openwrt - make defconfig > /dev/null 2>&1 + make defconfig source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh - Firmware_Diy_Main && Firmware_Diy - rm -f .config && cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config + Firmware_Diy_Before + rm .config && cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config + Firmware_Diy_Main + Firmware_Diy - name: Compile run: | - Result=false cd openwrt - source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh && Firmware_Diy_Other - rm -rf ./tmp && ./scripts/feeds install -a > /dev/null 2>&1 + source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh + Firmware_Diy_Other + ./scripts/feeds install -a > /dev/null 2>&1 make defconfig make download -j$(nproc) make -j$(nproc) || make -j1 V=s - [ $? == 0 ] && echo "Result=true" >> $GITHUB_ENV + [ $? == 0 ] && echo "Result=true" >> $GITHUB_ENV || echo "Result=false" >> $GITHUB_ENV - name: Process Firmware if: env.Result == 'true' && !cancelled() run: | cd openwrt - source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh && Firmware_Diy_End + source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh + Firmware_Diy_End - name: Upload Firmware to Artifacts uses: actions/upload-artifact@main diff --git a/.github/workflows/AutoBuild-x86_64.yml b/.github/workflows/AutoBuild-x86_64.yml index b29d69f..9dcef06 100644 --- a/.github/workflows/AutoBuild-x86_64.yml +++ b/.github/workflows/AutoBuild-x86_64.yml @@ -120,14 +120,16 @@ jobs: make defconfig source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh - Firmware_Diy_Main && Firmware_Diy + Firmware_Diy_Before + rm .config && cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config + Firmware_Diy_Main + Firmware_Diy - name: Compile run: | cd openwrt source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh Firmware_Diy_Other - rm -rf ./tmp ./scripts/feeds install -a > /dev/null 2>&1 make defconfig make download -j$(nproc) diff --git a/.github/workflows/AutoBuild-xiaomi_redmi-router-ac2100.yml b/.github/workflows/AutoBuild-xiaomi_redmi-router-ac2100.yml index 65faf03..2263aba 100644 --- a/.github/workflows/AutoBuild-xiaomi_redmi-router-ac2100.yml +++ b/.github/workflows/AutoBuild-xiaomi_redmi-router-ac2100.yml @@ -117,28 +117,31 @@ jobs: chmod +x Scripts/AutoBuild_*.sh cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE openwrt/.config cd openwrt - make defconfig > /dev/null 2>&1 + make defconfig source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh - Firmware_Diy_Main && Firmware_Diy - rm -f .config && cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config + Firmware_Diy_Before + rm .config && cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config + Firmware_Diy_Main + Firmware_Diy - name: Compile run: | - Result=false cd openwrt - source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh && Firmware_Diy_Other - rm -rf ./tmp && ./scripts/feeds install -a > /dev/null 2>&1 + source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh + Firmware_Diy_Other + ./scripts/feeds install -a > /dev/null 2>&1 make defconfig make download -j$(nproc) make -j$(nproc) || make -j1 V=s - [ $? == 0 ] && echo "Result=true" >> $GITHUB_ENV + [ $? == 0 ] && echo "Result=true" >> $GITHUB_ENV || echo "Result=false" >> $GITHUB_ENV - name: Process Firmware if: env.Result == 'true' && !cancelled() run: | cd openwrt - source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh && Firmware_Diy_End + source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh + Firmware_Diy_End - name: Upload Firmware to Artifacts uses: actions/upload-artifact@main diff --git a/.github/workflows/AutoBuild-xiaoyu_xy-c5.yml b/.github/workflows/AutoBuild-xiaoyu_xy-c5.yml index 103732c..495d713 100644 --- a/.github/workflows/AutoBuild-xiaoyu_xy-c5.yml +++ b/.github/workflows/AutoBuild-xiaoyu_xy-c5.yml @@ -117,28 +117,31 @@ jobs: chmod +x Scripts/AutoBuild_*.sh cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE openwrt/.config cd openwrt - make defconfig > /dev/null 2>&1 + make defconfig source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh - Firmware_Diy_Main && Firmware_Diy - rm -f .config && cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config + Firmware_Diy_Before + rm .config && cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config + Firmware_Diy_Main + Firmware_Diy - name: Compile run: | - Result=false cd openwrt - source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh && Firmware_Diy_Other - rm -rf ./tmp && ./scripts/feeds install -a > /dev/null 2>&1 + source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh + Firmware_Diy_Other + ./scripts/feeds install -a > /dev/null 2>&1 make defconfig make download -j$(nproc) make -j$(nproc) || make -j1 V=s - [ $? == 0 ] && echo "Result=true" >> $GITHUB_ENV + [ $? == 0 ] && echo "Result=true" >> $GITHUB_ENV || echo "Result=false" >> $GITHUB_ENV - name: Process Firmware if: env.Result == 'true' && !cancelled() run: | cd openwrt - source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh && Firmware_Diy_End + source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh + Firmware_Diy_End - name: Upload Firmware to Artifacts uses: actions/upload-artifact@main diff --git a/.github/workflows/Module_Refresh_API.yml b/.github/workflows/Module-Refresh_API.yml similarity index 82% rename from .github/workflows/Module_Refresh_API.yml rename to .github/workflows/Module-Refresh_API.yml index 88ec8d4..1a8910f 100644 --- a/.github/workflows/Module_Refresh_API.yml +++ b/.github/workflows/Module-Refresh_API.yml @@ -1,6 +1,5 @@ ########################################################### -# Description: Compile OpenWrt by GitHub Actions # -# Based on: https://github.com/P3TERX/Actions-OpenWrt # +# Description: Refresh Release API # # Author: Hyy2001X # ########################################################### @@ -11,14 +10,14 @@ on: workflow_dispatch: inputs: refresh_switch: - description: '刷新 Release/API' + description: '手动刷新 API' default: 'true' schedule: - cron: 0 4,16 * * * jobs: - build: + Job: runs-on: ubuntu-latest steps: @@ -42,4 +41,4 @@ jobs: uses: GitRML/delete-workflow-runs@main with: retain_days: 1 - keep_minimum_runs: 1 \ No newline at end of file + keep_minimum_runs: 1 diff --git a/.github/workflows/Module_Synchronise_Fork.yml b/.github/workflows/Module-Synchronise_Forks.yml similarity index 82% rename from .github/workflows/Module_Synchronise_Fork.yml rename to .github/workflows/Module-Synchronise_Forks.yml index d001c60..e24daf9 100644 --- a/.github/workflows/Module_Synchronise_Fork.yml +++ b/.github/workflows/Module-Synchronise_Forks.yml @@ -1,32 +1,32 @@ ############################################################ -# Description: GitHub Action to synchronise forks # +# Description: GitHub Action to Synchronise Forks # # Based on: danshui-git/github-forks-sync-action.git # # Modify: Hyy2001X # # Thanks to: https://github.com/281677160 # ############################################################ -name: Synchronise Fork +name: Synchronise Forks on: repository_dispatch: workflow_dispatch: inputs: sync_mode: - description: '确认同步上游所有内容' + description: '同步上游所有内容' default: 'false' env: SCRIPT_FILE: Scripts/Sync.sh jobs: - build: + Job: runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@main - - name: Run synchronise script + - name: Run Synchronise Script run: | [ "${{github.event.inputs.sync_mode}}" == true ] && { bash $GITHUB_WORKSPACE/Scripts/Sync.sh ${{secrets.GITHUB_TOKEN}} ${{github.repository}} --sync-all