From 21b0d6ceaf771b5897bf4045e6d403f1ecfd586d Mon Sep 17 00:00:00 2001
From: longhuan1999 <2114467924@qq.com>
Date: Fri, 13 Jan 2023 21:20:05 +0800
Subject: [PATCH] Update build-WSA-5.10.117-kernel.yml (#56)

---
 .../workflows/build-WSA-5.10.117-kernel.yml   | 48 +++++++------------
 1 file changed, 18 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/build-WSA-5.10.117-kernel.yml b/.github/workflows/build-WSA-5.10.117-kernel.yml
index 5793813a..89f079e8 100644
--- a/.github/workflows/build-WSA-5.10.117-kernel.yml
+++ b/.github/workflows/build-WSA-5.10.117-kernel.yml
@@ -14,14 +14,18 @@ jobs:
     strategy:
       matrix:
         include:
-          - version: 5.10.117.4
-            date: "20221110"
-          - version: 5.10.117.3
-            date: "20221104"
           - version: 5.10.117.2
+            arch: "x86_64"
+            out_file: "arch/x86/boot/bzImage"
+            kernel_make_cmd: "bzImage"
+            make_config: "config-wsa"
+            date: "20220906"
+          - version: 5.10.117.2
+            arch: "arm64"
+            out_file: "arch/arm64/boot/Image"
+            kernel_make_cmd: "ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu Image"
+            make_config: "config-wsa-arm64"
             date: "20220906"
-          - version: 5.10.117.1
-            date: "20220804"
 
     name: Build WSA-Kernel-${{ matrix.version }}
     runs-on: ubuntu-18.04
@@ -67,34 +71,18 @@ jobs:
         cd $KERNEL_ROOT && git apply $GITHUB_WORKSPACE/KernelSU/.github/patches/5.10/*.patch
         cd -
     
-    - name: Build x86_64 Kernel
+    - name: Build Kernel
       working-directory: WSA-Linux-Kernel
       run: |
         KERNEL_ROOT=$GITHUB_WORKSPACE/WSA-Linux-Kernel
         echo "[+] 构建 kernel"
-        cp configs/wsa/config-wsa-5.10 $KERNEL_ROOT/.config
-        echo "[+] 复制配置文件 configs/wsa/config-wsa-5.10 到 $KERNEL_ROOT/.config"
-        echo "执行: make -j`nproc` LLVM=1 bzImage"
-        make -j`nproc` LLVM=1 bzImage
-    
-    - name: Build arm64 Kernel
-      working-directory: WSA-Linux-Kernel
-      run: |
-        KERNEL_ROOT=$GITHUB_WORKSPACE/WSA-Linux-Kernel
-        echo "[+] 构建 kernel"
-        cp configs/wsa/config-wsa-arm64-5.10 $KERNEL_ROOT/.config
-        echo "[+] 复制配置文件 configs/wsa/config-wsa-arm64-5.10 到 $KERNEL_ROOT/.config"
-        echo "执行: make -j`nproc` LLVM=1 ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu Image"
-        make -j`nproc` LLVM=1 ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu Image
+        cp configs/wsa/${{ matrix.make_config }}-5.10 $KERNEL_ROOT/.config
+        echo "[+] 复制配置文件 configs/wsa/${{ matrix.make_config }}-5.10 到 $KERNEL_ROOT/.config"
+        echo "执行: make -j`nproc` LLVM=1 ${{ matrix.kernel_make_cmd }}"
+        make -j`nproc` LLVM=1 ${{ matrix.kernel_make_cmd }}
 
-    - name: Upload kernel-x86_64-${{ matrix.version }}
+    - name: Upload kernel-${{ matrix.arch }}-${{ matrix.version }}
       uses: actions/upload-artifact@v3
       with:
-        name: kernel-WSA-x86_64-${{ matrix.version }}-${{ matrix.date }}
-        path: WSA-Linux-Kernel/arch/x86/boot/bzImage
-
-    - name: Upload kernel-arm64-${{ matrix.version }}
-      uses: actions/upload-artifact@v3
-      with:
-        name: kernel-WSA-arm64-${{ matrix.version }}-${{ matrix.date }}
-        path: WSA-Linux-Kernel/arch/arm64/boot/Image
+        name: kernel-WSA-${{ matrix.arch }}-${{ matrix.version }}-${{ matrix.date }}
+        path: WSA-Linux-Kernel/${{ matrix.out_file }}