重构 AutoBuild 代码

.github/workflows/AutoBuild.yml

@@ -6,7 +6,7 @@
 # Modify: Hyy2001X
 #=======================================================
 
-name: AutoBuild-NEWIFI_D2-NIGHTLY
+name: AutoBuild
 
 on: 
 #  release:
@@ -24,12 +24,14 @@ on:
 
 env:
   REPO_URL: https://github.com/coolsnowwolf/lede
-  CONFIG_FILE: Configs/NEWIFI_D2-NIGHTLY.config
-  DIY_SCRIPT: Scripts/diy-script.sh
+  CONFIG_FILE: NEWIFI_D2-NIGHTLY.config
+  DIY_SCRIPT: Scripts/AutoBuild_DiyScript.sh
+  FUNCTION_SCRIPT: Scripts/AutoBuild_Function.sh
   UPLOAD_RELEASE: true
   UPLOAD_FIRMWARE: true
   UPLOAD_BIN_DIR: false
   REMOVE_OLD_RELEASE: false
+  REMOVE_WORKFLOW_RUNS: true
 
 jobs:
   build:
@@ -51,14 +53,15 @@ jobs:
 
     - name: Clone Openwrt source code
       run: |
-        git clone $REPO_URL openwrt
+        git clone -b master $REPO_URL openwrt
         ln -sf /workdir/openwrt $GITHUB_WORKSPACE/openwrt
 
     - name: Run Diy-Part1 Scripts
       run: |
         chmod +x $DIY_SCRIPT
         cd openwrt
-        source $GITHUB_WORKSPACE/$DIY_SCRIPT && Diy-Part1
+        source $GITHUB_WORKSPACE/$DIY_SCRIPT
+        source $GITHUB_WORKSPACE/$FUNCTION_SCRIPT && Diy-Part1
         echo "Compile_Date=$(date +%Y%m%d)" > $GITHUB_WORKSPACE/Openwrt.info
         echo "Display_Date=$(date +'%Y/%m/%d')" >> $GITHUB_WORKSPACE/Openwrt.info
 
@@ -72,7 +75,8 @@ jobs:
       run: |
         [ -f $CONFIG_FILE ] && mv $CONFIG_FILE openwrt/.config
         cd openwrt
-        source $GITHUB_WORKSPACE/$DIY_SCRIPT && Diy-Part2
+        source $GITHUB_WORKSPACE/$DIY_SCRIPT
+        source $GITHUB_WORKSPACE/$FUNCTION_SCRIPT && Diy-Part2
 
     - name: Download Packages
       run: |
@@ -88,9 +92,10 @@ jobs:
 
     - name: Run Diy-Part3 Scripts
       run: |
-        echo "## $(date +"%Y%m%d")-NEWIFI_D2-NIGHTLY" > update_log.txt
+        echo "## $(date +"%Y%m%d")" > update_log.txt
         cd openwrt
-        source $GITHUB_WORKSPACE/$DIY_SCRIPT && Diy-Part3
+        source $GITHUB_WORKSPACE/$DIY_SCRIPT
+        source $GITHUB_WORKSPACE/$FUNCTION_SCRIPT && Diy-Part3
         echo "Artifacts_DATE=$(date +"%Y%m%d%H%M")" >> $GITHUB_ENV
 
     - name: Upload Firmware to Artifacts
@@ -125,3 +130,10 @@ jobs:
         delete_tags: true
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        
+    - name: Remove workflow runs
+      uses: GitRML/delete-workflow-runs@main
+      if: env.REMOVE_WORKFLOW_RUNS == 'true' && !cancelled()
+      with:
+        retain_days: 1
+        keep_minimum_runs: 3