update

roacn · Dec 10, 2023 · 750a890 · 750a890
1 parent dc38d58
commit 750a890
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 85 deletions.
diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
@@ -132,7 +132,7 @@ jobs:
       if: steps.compile.outcome == 'success' && env.UPLOAD_FIRMWARE == 'true'
       uses: actions/upload-artifact@v3
       with:
-        name: ${{ env.SOURCE }}-${{ env.LUCI_EDITION }}-${{ env.KERNEL_PATCHVER }}-${{ env.TARGET_PROFILE }}-firmware-${{ env.COMPILE_DATE_HM }}
+        name: ${{ env.SOURCE }}-${{ env.LUCI_EDITION }}-${{ env.LINUX_KERNEL }}-${{ env.TARGET_PROFILE }}-firmware-${{ env.COMPILE_DATE_HM }}
         path: ${{ env.FIRMWARE_PATH }}
 
     - name: 发布固件

diff --git a/.github/workflows/lede-lxc.yml b/.github/workflows/lede-lxc.yml
@@ -30,15 +30,6 @@ on:
           - 'x86_64'
           - 'x86_32'
           - '.config'
-      FIRMWARE_TYPE:
-        description: '固件类型'
-        required: false
-        default: 'default'
-        type: choice
-        options:
-          - 'default'
-          - 'lxc'
-          - 'kvm'
       BIOS_MODE:
         description: '固件引导模式'
         required: false
@@ -59,15 +50,6 @@ on:
           - 'fast'
           - 'normal'
           - 'false'
-      UPLOAD_CONFIG:
-        description: '上传.config到 Github Artifacts'
-        required: false
-        default: 'default'
-        type: choice
-        options:
-          - 'default'
-          - 'true'
-          - 'false'
       UPLOAD_FIRMWARE:
         description: '上传固件到 Github Artifacts'
         required: false
@@ -134,10 +116,8 @@ jobs:
         cd $GITHUB_WORKSPACE
         INPUTS_SOURCE_BRANCH="${{ github.event.inputs.SOURCE_BRANCH }}"
         INPUTS_CONFIG_FILE="${{ github.event.inputs.CONFIG_FILE }}"
-        INPUTS_FIRMWARE_TYPE="${{ github.event.inputs.FIRMWARE_TYPE }}"
         INPUTS_BIOS_MODE="${{ github.event.inputs.BIOS_MODE }}"        
         INPUTS_ENABLE_CCACHE="${{ github.event.inputs.ENABLE_CCACHE }}"
-        INPUTS_UPLOAD_CONFIG="${{ github.event.inputs.UPLOAD_CONFIG }}"
         INPUTS_UPLOAD_FIRMWARE="${{ github.event.inputs.UPLOAD_FIRMWARE }}"
         INPUTS_UPLOAD_RELEASE="${{ github.event.inputs.UPLOAD_RELEASE }}"
         INPUTS_ENABLE_SSH="${{ github.event.inputs.ENABLE_SSH }}"

diff --git a/.github/workflows/lede.yml b/.github/workflows/lede.yml
@@ -30,15 +30,6 @@ on:
           - 'x86_64'
           - 'x86_32'
           - '.config'
-      FIRMWARE_TYPE:
-        description: '固件类型'
-        required: false
-        default: 'default'
-        type: choice
-        options:
-          - 'default'
-          - 'lxc'
-          - 'kvm'
       BIOS_MODE:
         description: '固件引导模式'
         required: false
@@ -59,15 +50,6 @@ on:
           - 'fast'
           - 'normal'
           - 'false'
-      UPLOAD_CONFIG:
-        description: '上传.config到 Github Artifacts'
-        required: false
-        default: 'default'
-        type: choice
-        options:
-          - 'default'
-          - 'true'
-          - 'false'
       UPLOAD_FIRMWARE:
         description: '上传固件到 Github Artifacts'
         required: false
@@ -134,10 +116,8 @@ jobs:
         cd $GITHUB_WORKSPACE
         INPUTS_SOURCE_BRANCH="${{ github.event.inputs.SOURCE_BRANCH }}"
         INPUTS_CONFIG_FILE="${{ github.event.inputs.CONFIG_FILE }}"
-        INPUTS_FIRMWARE_TYPE="${{ github.event.inputs.FIRMWARE_TYPE }}"
         INPUTS_BIOS_MODE="${{ github.event.inputs.BIOS_MODE }}"        
         INPUTS_ENABLE_CCACHE="${{ github.event.inputs.ENABLE_CCACHE }}"
-        INPUTS_UPLOAD_CONFIG="${{ github.event.inputs.UPLOAD_CONFIG }}"
         INPUTS_UPLOAD_FIRMWARE="${{ github.event.inputs.UPLOAD_FIRMWARE }}"
         INPUTS_UPLOAD_RELEASE="${{ github.event.inputs.UPLOAD_RELEASE }}"
         INPUTS_ENABLE_SSH="${{ github.event.inputs.ENABLE_SSH }}"

diff --git a/.github/workflows/openwrt-lxc.yml b/.github/workflows/openwrt-lxc.yml
@@ -35,15 +35,6 @@ on:
           - 'x86_64'
           - 'x86_32'
           - '.config'
-      FIRMWARE_TYPE:
-        description: '固件类型'
-        required: false
-        default: 'default'
-        type: choice
-        options:
-          - 'default'
-          - 'lxc'
-          - 'kvm'
       BIOS_MODE:
         description: '固件引导模式'
         required: false
@@ -64,15 +55,6 @@ on:
           - 'fast'
           - 'normal'
           - 'false'
-      UPLOAD_CONFIG:
-        description: '上传.config到 Github Artifacts'
-        required: false
-        default: 'default'
-        type: choice
-        options:
-          - 'default'
-          - 'true'
-          - 'false'
       UPLOAD_FIRMWARE:
         description: '上传固件到 Github Artifacts'
         required: false
@@ -139,10 +121,8 @@ jobs:
         cd $GITHUB_WORKSPACE
         INPUTS_SOURCE_BRANCH="${{ github.event.inputs.SOURCE_BRANCH }}"
         INPUTS_CONFIG_FILE="${{ github.event.inputs.CONFIG_FILE }}"
-        INPUTS_FIRMWARE_TYPE="${{ github.event.inputs.FIRMWARE_TYPE }}"
         INPUTS_BIOS_MODE="${{ github.event.inputs.BIOS_MODE }}"        
         INPUTS_ENABLE_CCACHE="${{ github.event.inputs.ENABLE_CCACHE }}"
-        INPUTS_UPLOAD_CONFIG="${{ github.event.inputs.UPLOAD_CONFIG }}"
         INPUTS_UPLOAD_FIRMWARE="${{ github.event.inputs.UPLOAD_FIRMWARE }}"
         INPUTS_UPLOAD_RELEASE="${{ github.event.inputs.UPLOAD_RELEASE }}"
         INPUTS_ENABLE_SSH="${{ github.event.inputs.ENABLE_SSH }}"

diff --git a/.github/workflows/openwrt.yml b/.github/workflows/openwrt.yml
@@ -35,15 +35,6 @@ on:
           - 'x86_64'
           - 'x86_32'
           - '.config'
-      FIRMWARE_TYPE:
-        description: '固件类型'
-        required: false
-        default: 'default'
-        type: choice
-        options:
-          - 'default'
-          - 'lxc'
-          - 'kvm'
       BIOS_MODE:
         description: '固件引导模式'
         required: false
@@ -64,15 +55,6 @@ on:
           - 'fast'
           - 'normal'
           - 'false'
-      UPLOAD_CONFIG:
-        description: '上传.config到 Github Artifacts'
-        required: false
-        default: 'default'
-        type: choice
-        options:
-          - 'default'
-          - 'true'
-          - 'false'
       UPLOAD_FIRMWARE:
         description: '上传固件到 Github Artifacts'
         required: false
@@ -139,10 +121,8 @@ jobs:
         cd $GITHUB_WORKSPACE
         INPUTS_SOURCE_BRANCH="${{ github.event.inputs.SOURCE_BRANCH }}"
         INPUTS_CONFIG_FILE="${{ github.event.inputs.CONFIG_FILE }}"
-        INPUTS_FIRMWARE_TYPE="${{ github.event.inputs.FIRMWARE_TYPE }}"
         INPUTS_BIOS_MODE="${{ github.event.inputs.BIOS_MODE }}"        
         INPUTS_ENABLE_CCACHE="${{ github.event.inputs.ENABLE_CCACHE }}"
-        INPUTS_UPLOAD_CONFIG="${{ github.event.inputs.UPLOAD_CONFIG }}"
         INPUTS_UPLOAD_FIRMWARE="${{ github.event.inputs.UPLOAD_FIRMWARE }}"
         INPUTS_UPLOAD_RELEASE="${{ github.event.inputs.UPLOAD_RELEASE }}"
         INPUTS_ENABLE_SSH="${{ github.event.inputs.ENABLE_SSH }}"

diff --git a/build/Lede/settings.ini b/build/Lede/settings.ini
@@ -1,6 +1,5 @@
 ##################################################编译基础设置#################################################
 SOURCE_ABBR="lede"                                  # 源码仓库;(请勿修改)(源码链接: https://github.com/coolsnowwolf/lede)
-##################################################workflow重叠设置#################################################
 SOURCE_BRANCH="master"                              # 源码链接的分支;(请勿修改)
 CONFIG_FILE="x86_64"                                # 配置文件;(可SSH远程定制固件插件,也可在本地提取配置粘贴到此文件)
 FIRMWARE_TYPE="kvm"                                 # 固件类型;(lxc=PVE的lxc固件;kvm=普通虚拟机固件)

diff --git a/build/Lede_lxc/settings.ini b/build/Lede_lxc/settings.ini
@@ -1,6 +1,5 @@
 ##################################################编译基础设置#################################################
 SOURCE_ABBR="lede"                                  # 源码仓库;(请勿修改)(源码链接: https://github.com/coolsnowwolf/lede)
-##################################################workflow重叠设置#################################################
 SOURCE_BRANCH="master"                              # 源码链接的分支;(请勿修改)
 CONFIG_FILE="x86_64"                                # 配置文件;(可SSH远程定制固件插件,也可在本地提取配置粘贴到此文件)
 FIRMWARE_TYPE="lxc"                                 # 固件类型;(lxc=PVE的lxc固件;kvm=普通虚拟机固件)

diff --git a/build/Openwrt/settings.ini b/build/Openwrt/settings.ini
@@ -1,6 +1,5 @@
 ##################################################编译基础设置#################################################
 SOURCE_ABBR="openwrt"                               # 源码仓库;(请勿修改)(源码链接: https://github.com/openwrt/openwrt)
-##################################################workflow重叠设置#################################################
 SOURCE_BRANCH="main"                                # 源码链接的分支;(请勿修改)
 CONFIG_FILE="x86_64"                                # 配置文件;(可SSH远程定制固件插件,也可在本地提取配置粘贴到此文件)
 FIRMWARE_TYPE="kvm"                                 # 固件类型;(lxc=PVE的lxc固件;kvm=普通虚拟机固件)

diff --git a/build/Openwrt_lxc/settings.ini b/build/Openwrt_lxc/settings.ini
@@ -1,6 +1,5 @@
 ##################################################编译基础设置#################################################
 SOURCE_ABBR="openwrt"                               # 源码仓库;(请勿修改)(源码链接: https://github.com/openwrt/openwrt)
-##################################################workflow重叠设置#################################################
 SOURCE_BRANCH="main"                                # 源码链接的分支;(请勿修改)
 CONFIG_FILE="x86_64"                                # 配置文件;(可SSH远程定制固件插件,也可在本地提取配置粘贴到此文件)
 FIRMWARE_TYPE="lxc"                                 # 固件类型;(lxc=PVE的lxc固件;kvm=普通虚拟机固件)