AutoBuild-Actions: 20211120 功能更新

2021/11/20 更新内容 1. 修改部分变量和函数名 2.0 workflows: 所有文件新增支持使用 /Configs 目录中的临时配置文件; 优化流程 2.1 workflows: 删除 AutoBuild.yml 3.0 AutoBuild_DiyScript.sh: 新增用户自定义变量 Author_URL=AUTO; 移除 Load_CustomPackages_List 3.1 AutoBuild_DiyScript.sh: 修改与新增预设变量 3.2 x86 设备在 lean 源码中默认修改为 ImmortalWrt 软件源 4. 删除软件包列表: AutoBuild_ExtraPackages.sh,所有内容移至 AutoBuild_DiyScript.sh 5. 删除无用文件: CustomFiles\Depends\{base-files-essential,Custom_Variable,DRM-I915}, 内容移至 AutoBuild_Function.sh 6. {Sync.sh,AutoUpdate.sh,AutoBuild_Function.sh} 同步改动 7. 重命名 {d-team_newifi-d2_mac80211.patch,d-team_newifi-d2_system} 8. 修改 x86 固件格式为 {BIOS,UEFI} 9. 固件升级保留列表添加 /.uuplugin_uuid 改动内容较大, 建议重新 Fork 本仓库
2026-09-18 08:20:11 +00:00 · 2021-11-20 22:04:51 +08:00
parent 689e53f08c
commit 64e87c84df
18 changed files with 596 additions and 670 deletions
@@ -6,15 +6,18 @@

 name: x86_64

-### 以下内容请保持不变 (请修改下方: 环境变量设置)
+### 以下内容请保持不变 (请修改下方的 环境变量设置)
 on:
  repository_dispatch:
  workflow_dispatch:
    inputs:
-      IP:
-        description: '固件 IP 地址 [可选]'
+      Tempoary_IP:
+        description: '临时修改 IP 地址 [可选]'
        default: ''
-### END
+      Tempoary_CONFIG:
+        description: '配置文件 [可选]'
+        default: ''
+### 结束

  #push:
  #  branches: 
@@ -42,7 +45,7 @@ env:
  DELETE_USELESS_FILES: true
 # 删除早期的 workflow 任务
  DELETE_OLD_WORKFLOW: true
-### END
+### 结束

 jobs:
  Compile:
@@ -52,27 +55,37 @@ jobs:
    - name: Checkout
      uses: actions/checkout@main

-    - name: Initialization Define Info
+    - name: Initialization Variables
      run: |
-        CONFIG_FILE=${{ env.CONFIG_FILE }}
-        DEFAULT_SOURCE=${{ env.DEFAULT_SOURCE }}
-        DELETE_USELESS_FILES=${{ env.DELETE_USELESS_FILES }}
-        echo "CONFIG_FILE=$CONFIG_FILE" >> $GITHUB_ENV
-        echo "DELETE_USELESS_FILES=$DELETE_USELESS_FILES" >> $GITHUB_ENV
-        [ ! -f "$GITHUB_WORKSPACE/Configs/$CONFIG_FILE" ] && {
-            echo "Config_File: [/Config/$CONFIG_FILE] is not detected!"
+        if [ -n "${{ github.event.inputs.Tempoary_CONFIG }}" ]
+        then
+            if [ -f "$GITHUB_WORKSPACE/Configs/${{ github.event.inputs.Tempoary_CONFIG }}" ]
+            then
+                CONFIG_FILE=${{ github.event.inputs.Tempoary_CONFIG }}
+            else
+                CONFIG_FILE=${{ env.CONFIG_FILE }}
+            fi
+        else
+            CONFIG_FILE=${{ env.CONFIG_FILE }}
+        fi
+        if [ ! -f "$GITHUB_WORKSPACE/Configs/$CONFIG_FILE" ]
+        then
+            echo "CONFIG_FILE: [/Config/$CONFIG_FILE] is not detected !"
            exit 1
-        }
-        export REPO_URL="https://github.com/$(echo $DEFAULT_SOURCE | cut -d \: -f 1)"
-        export REPO_BRANCH=$(echo $DEFAULT_SOURCE | cut -d \: -f 2)
-        [ -z $REPO_BRANCH ] && REPO_BRANCH=master
+        else
+            echo "CONFIG_FILE: [/Config/$CONFIG_FILE]"
+            echo "CONFIG_FILE=$CONFIG_FILE" >> $GITHUB_ENV
+        fi
+        if [ -n "${{ github.event.inputs.Tempoary_IP }}" ]
+        then
+            echo "Tempoary_IP=${{ github.event.inputs.Tempoary_IP }}" >> $GITHUB_ENV
+        fi
+        REPO_URL="https://github.com/$(echo ${{ env.DEFAULT_SOURCE }} | cut -d \: -f 1)"
+        REPO_BRANCH=$(echo ${{ env.DEFAULT_SOURCE }} | cut -d \: -f 2)
        echo "REPO_URL=$REPO_URL" >> $GITHUB_ENV
        echo "REPO_BRANCH=$REPO_BRANCH" >> $GITHUB_ENV
-        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 "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
+        echo "Compile_Date=$(date +%Y%m%d%H%M)" >> $GITHUB_ENV
+        echo "Display_Date=$(date +%Y/%m/%d)" >> $GITHUB_ENV

    - name: Initialization Environment
      env:
@@ -83,7 +96,8 @@ jobs:
        sudo timedatectl set-timezone "Asia/Shanghai"
        sudo mkdir -p /workdir
        sudo chown $USER:$GROUPS /workdir
-        if [ "$DELETE_USELESS_FILES" == true ];then
+        if [ "${{ env.DELETE_USELESS_FILES }}" == true ]
+        then
            docker rmi $(docker images -q)
            sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php
            sudo -E apt-get -y autoremove --purge
@@ -96,54 +110,54 @@ jobs:
        ln -sf /workdir/openwrt $GITHUB_WORKSPACE/openwrt
        cd openwrt
        ./scripts/feeds update -a
-        ./scripts/feeds install -a > /dev/null 2>&1
+        ./scripts/feeds install -a

    - name: Run AutoBuild_DiyScript.sh
      run: |
        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
-        source $GITHUB_WORKSPACE/openwrt/VARIABLE_FILE && Firmware-Diy
-        rm -f .config && cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE .config
+        Firmware_Diy_Main && Firmware_Diy

    - name: Compile
      run: |
-        export Compile_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
+        rm -rf ./tmp
+        ./scripts/feeds install -a > /dev/null 2>&1
        make defconfig
        make download -j$(nproc)
        make -j$(nproc) || make -j1 V=s
-        [ $? == 0 ] && echo "Compile_Result=true" >> $GITHUB_ENV
+        [ $? == 0 ] && echo "Result=true" >> $GITHUB_ENV || echo "Result=false" >> $GITHUB_ENV

    - name: Process Firmware
-      if: env.Compile_Result == 'true' && !cancelled()
+      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
-      if: env.UPLOAD_ARTIFACTS == 'true' && env.Compile_Result == 'true' && !cancelled()
+      if: env.UPLOAD_ARTIFACTS == 'true' && env.Result == 'true' && !cancelled()
      with:
-        name: ${{ env.REPO_BRANCH }}_firmware_${{ env.Artifacts_Date }}
+        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' && env.Result == 'true' && !cancelled()
      with:
-        name: ${{ env.REPO_BRANCH }}_bin_${{ env.Artifacts_Date }}
+        name: ${{ env.CONFIG_FILE }}_bin_${{ env.Compile_Date }}
        path: openwrt/bin

    - name: Upload Firmware to Github Release
      uses: svenstaro/upload-release-action@v2
-      if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
+      if: env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
      with:
        repo_token: ${{ secrets.GITHUB_TOKEN }}
        file: openwrt/bin/Firmware/*
@@ -152,12 +166,12 @@ jobs:
        overwrite: true
        
    - name: Download Github Release API
-      if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
+      if: env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
      run: |
        wget https://api.github.com/repos/${{github.repository}}/releases/tags/AutoUpdate -O API
        
    - name: Upload API to Github Release
-      if: env.UPLOAD_RELEASES == 'true' && env.Compile_Result == 'true' && !cancelled()
+      if: env.UPLOAD_RELEASES == 'true' && env.Result == 'true' && !cancelled()
      uses: svenstaro/upload-release-action@v2
      with:
        repo_token: ${{ secrets.GITHUB_TOKEN }}