From 4cb8c98134ac89f91c9d0e2b6bcebc6bf1d373b8 Mon Sep 17 00:00:00 2001
From: Ing <wjz304@qq.com>
Date: Fri, 20 Dec 2024 16:46:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BC=96=E8=AF=91=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/modules.yml | 39 ++++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/modules.yml b/.github/workflows/modules.yml
index fc588bb..ddf9c85 100644
--- a/.github/workflows/modules.yml
+++ b/.github/workflows/modules.yml
@@ -25,9 +25,13 @@ jobs:
       matrix:
         include:
           - arch: x86_64
-            kver: 4.14.24
+            qver: 4.5.4
+          #- arch: x86_64
+          #  qver: 5.0.0
+          #- arch: x86_64
+          #  qver: 5.1.0
           - arch: x86_64
-            kver: 5.10.60
+            qver: 5.2.0
 
     runs-on: ubuntu-latest
     steps:
@@ -53,19 +57,34 @@ jobs:
       - name: Make modules
         run: |
           sudo -s  # use root to compile
-          KVER=${{ matrix.kver }}
+          ROOT_PATH=${{ github.workspace }}
+          ARCH=${{ matrix.arch }}
+          QVER=${{ matrix.qver }}
+          DEVICE="TS-X89"
+
           . qr-modules/compile.sh
+
           echo "makeEnvDeploy"
-          makeEnvDeploy ${{ matrix.arch }} "${KVER%.*}"
+          makeEnvDeploy "${ROOT_PATH}" "${ARCH}" "${QVER}" "${DEVICE}"
 
           echo "makemodules"
-          makemodules "qr-modules/src/${KVER}" "output/modules/${KVER}-qnap"
+          KVER=$(getKver "${ROOT_PATH}" "${ARCH}" "${QVER}" "${DEVICE}")
+          mkdir -p "output/modules/${KVER}-qnap"
+          makemodules "${ROOT_PATH}" "${ARCH}" "${QVER}" "${DEVICE}" "qr-modules/src/${KVER}" "output/modules/${KVER}-qnap"
 
       - name: firmware
         run: |
-          KVER=${{ matrix.kver }}
+          sudo -s  # use root to compile
+          ROOT_PATH=${{ github.workspace }}
+          ARCH=${{ matrix.arch }}
+          QVER=${{ matrix.qver }}
+          DEVICE="TS-X89"
+
+          . qr-modules/compile.sh
+
+          KVER=$(getKver "${ROOT_PATH}" "${ARCH}" "${QVER}" "${DEVICE}")
 
-          mkdir -p output/firmware
+          mkdir -p "output/firmware"
 
           echo "get firmware"
           SOURCE=/tmp/linux-firmware
@@ -81,14 +100,14 @@ jobs:
 
       - name: Tar to Artifacts
         run: |
-          tar -zcf ${{ matrix.arch }}-${{ matrix.kver }}.tgz -C output .
+          tar -zcf ${{ matrix.arch }}-${{ matrix.qver }}.tgz -C output .
 
       - name: Upload to Artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: modules-${{ matrix.arch }}-${{ matrix.kver }}
+          name: modules-${{ matrix.arch }}-${{ matrix.qver }}
           path: |
-            ${{ matrix.arch }}-${{ matrix.kver }}.tgz
+            ${{ matrix.arch }}-${{ matrix.qver }}.tgz
 
   release:
     runs-on: ubuntu-latest