fix release

tiann · Mar 14, 2024 · 4618987 · 4618987
1 parent 14639c9
commit 4618987
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 24 deletions.
diff --git a/.github/workflows/build-lkm.yml b/.github/workflows/build-lkm.yml
@@ -29,32 +29,14 @@ jobs:
             os_patch_level: 2023-12
           - version: "android14-5.15"
             sub_level: 110
-            os_patch_level: 2023-09
+            os_patch_level: 2023-06
           - version: "android14-6.1"
-            sub_level: 43
+            sub_level: 25
             os_patch_level: 2023-11
     uses: ./.github/workflows/gki-kernel.yml
     with:
       version: ${{ matrix.version }}
       version_name: ${{ matrix.version }}.${{ matrix.sub_level }}
       tag: ${{ matrix.version }}-${{ matrix.os_patch_level }}
       os_patch_level: ${{ matrix.os_patch_level }}
-      build_lkm: true
-
-  upload-artifacts:
-    needs: build-lkm
-    runs-on: ubuntu-latest
-    env:
-      CHAT_ID: ${{ secrets.CHAT_ID }}
-      BOT_TOKEN: ${{ secrets.BOT_TOKEN }}
-      MESSAGE_THREAD_ID: ${{ secrets.MESSAGE_THREAD_ID }}
-      COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
-      COMMIT_URL: ${{ github.event.head_commit.url }}
-      RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
-    steps:
-      - name: Download artifacts
-        uses: actions/download-artifact@v4
-
-      - name: List artifacts
-        run: |
-          tree
+      build_lkm: true
diff --git a/.github/workflows/gki-kernel.yml b/.github/workflows/gki-kernel.yml
@@ -217,7 +217,7 @@ jobs:
           mkdir output
           if [ "${{ inputs.build_lkm}}" = "true" ]; then 
             llvm-strip-15 --strip-debug $OUTDIR/kernelsu.ko
-            cp $OUTDIR/kernelsu.ko ./output/
+            mv $OUTDIR/kernelsu.ko ./output/${{ inputs.version }}_kernelsu.ko
           else
             cp $OUTDIR/Image ./output/
             cp $OUTDIR/Image.lz4 ./output/
@@ -244,5 +244,5 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ inputs.build_lkm == true }}
         with:
-          name: ${{ inputs.version }}_kernelsu.ko
-          path: ./output/kernelsu.ko
+          name: ${{ inputs.version }}-lkm
+          path: ./output/*_kernelsu.ko
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -75,6 +75,7 @@ jobs:
         with:
           files: |
             manager/*.apk
+            *-lkm/*.ko
             AnyKernel3-*.zip
             boot-images-*/Image-*/*.img.gz
             kernel-WSA*.zip