Updates (#151)

* Update

* Fix

.github/workflows/build-kernel-a12.yml

@@ -27,6 +27,8 @@ jobs:
             os_patch_level: 2024-08
           - sub_level: 226
             os_patch_level: 2024-11
+          - sub_level: 233
+            os_patch_level: 2025-02
     uses: ./.github/workflows/gki-kernel.yml
     secrets: inherit
     with:

.github/workflows/build-kernel-a14.yml

@@ -69,6 +69,9 @@ jobs:
           - version: "6.1"
             sub_level: 118
             os_patch_level: 2025-01
+          - version: "6.1"
+            sub_level: 124
+            os_patch_level: 2025-02
     uses: ./.github/workflows/gki-kernel.yml
     secrets: inherit
     with:

.github/workflows/build-kernel-a15.yml

@@ -39,6 +39,9 @@ jobs:
           - version: "6.6"
             sub_level: 58
             os_patch_level: 2025-01
+          - version: "6.6"
+            sub_level: 66
+            os_patch_level: 2025-02
     uses: ./.github/workflows/gki-kernel.yml
     secrets: inherit
     with:

.github/workflows/build-lkm.yml

@@ -15,8 +15,8 @@ jobs:
       matrix:
         include:
           - version: "android12-5.10"
-            sub_level: 226
-            os_patch_level: 2024-11
+            sub_level: 233
+            os_patch_level: 2025-02
           - version: "android13-5.10"
             sub_level: 228
             os_patch_level: 2025-01
@@ -27,11 +27,11 @@ jobs:
             sub_level: 170
             os_patch_level: 2025-01
           - version: "android14-6.1"
-            sub_level: 118
-            os_patch_level: 2025-01
+            sub_level: 124
+            os_patch_level: 2025-02
           - version: "android15-6.6"
-            sub_level: 58
-            os_patch_level: 2025-01
+            sub_level: 66
+            os_patch_level: 2025-02
     uses: ./.github/workflows/gki-kernel.yml
     with:
       version: ${{ matrix.version }}

.github/workflows/build-manager-ci.yml

@@ -15,10 +15,6 @@ on:
     paths:
       - '.github/workflows/build-manager-ci.yml'
       - 'manager/**'
-      - 'kernel/**'
-      - 'userspace/ksud_overlayfs**'
-      - 'userspace/ksud_magic/**'
-      - 'userspace/susfsd/**'
   workflow_call:
   workflow_dispatch:
 
@@ -39,39 +35,27 @@ jobs:
       target: ${{ matrix.target }}
       os: ${{ matrix.os }}
 
-  build-ksud_overlayfs:
+  build-ksud:
     needs: build-susfsd
     strategy:
       matrix:
         include:
           - target: aarch64-linux-android
             os: ubuntu-latest
-    uses: ./.github/workflows/ksud_overlayfs.yml
-    with:
-      target: ${{ matrix.target }}
-      os: ${{ matrix.os }}
-
-  build-ksud_magic:
-    needs: build-susfsd
-    strategy:
-      matrix:
-        include:
-          - target: aarch64-linux-android
-            os: ubuntu-latest
-    uses: ./.github/workflows/ksud_magic.yml
+    uses: ./.github/workflows/ksud.yml
     with:
       target: ${{ matrix.target }}
       os: ${{ matrix.os }}
 
   build-manager:
-    needs: [build-ksud_magic, build-ksud_overlayfs]
+    needs: build-ksud
     runs-on: ubuntu-latest
     defaults:
       run:
         working-directory: ./manager
 
     steps:
-      - name: Checkout
+      - name: Checkout Repository
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
@@ -85,7 +69,7 @@ jobs:
             echo "UPLOAD=false" >> $GITHUB_OUTPUT
           fi
 
-      - name: Write key
+      - name: Write Key
         run: |
           if [ ! -z "${{ secrets.KEYSTORE }}" ]; then
             {
@@ -106,9 +90,6 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
 
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v3
-
       - name: Download arm64 susfsd
         uses: actions/download-artifact@v4
         with:
@@ -152,19 +133,19 @@ jobs:
           chmod +x gradlew
           ./gradlew clean assembleRelease
 
-      - name: Upload build artifact
+      - name: Upload Build Artifact
         uses: actions/upload-artifact@v4
         with:
-          name: manager
+          name: Manager
           path: manager/app/build/outputs/apk/release/*.apk
 
-      - name: Upload mappings
+      - name: Upload Mappings
         uses: actions/upload-artifact@v4
         with:
-          name: "mappings"
-          path: "manager/app/build/outputs/mapping/release/"
+          name: Mappings
+          path: manager/app/build/outputs/mapping/release/
 
-      - name: Bot session cache
+      - name: Bot Session Cache
         if: steps.need_upload.outputs.UPLOAD == 'true'
         id: bot_session_cache
         uses: actions/cache@v4
@@ -172,7 +153,7 @@ jobs:
           path: scripts/ksunextbot.session
           key: ${{ runner.os }}-bot-session
 
-      - name: Upload to telegram
+      - name: Upload to Telegram
         if: steps.need_upload.outputs.UPLOAD == 'true'
         env:
           API_ID: ${{ secrets.API_ID }}

.github/workflows/build-manager.yml

@@ -15,10 +15,6 @@ on:
   #   paths:
   #     - '.github/workflows/build-manager-ci.yml'
   #     - 'manager/**'
-  #     - 'kernel/**'
-  #     - 'userspace/ksud_overlayfs**'
-  #     - 'userspace/ksud_magic/**'
-  #     - 'userspace/susfsd/**'
   workflow_call:
   workflow_dispatch:
 
@@ -39,39 +35,27 @@ jobs:
       target: ${{ matrix.target }}
       os: ${{ matrix.os }}
 
-  build-ksud_overlayfs:
+  build-ksud:
     needs: build-susfsd
     strategy:
       matrix:
         include:
           - target: aarch64-linux-android
             os: ubuntu-latest
-    uses: ./.github/workflows/ksud_overlayfs.yml
-    with:
-      target: ${{ matrix.target }}
-      os: ${{ matrix.os }}
-
-  build-ksud_magic:
-    needs: build-susfsd
-    strategy:
-      matrix:
-        include:
-          - target: aarch64-linux-android
-            os: ubuntu-latest
-    uses: ./.github/workflows/ksud_magic.yml
+    uses: ./.github/workflows/ksud.yml
     with:
       target: ${{ matrix.target }}
       os: ${{ matrix.os }}
 
   build-manager:
-    needs: [build-ksud_magic, build-ksud_overlayfs]
+    needs: build-ksud
     runs-on: ubuntu-latest
     defaults:
       run:
         working-directory: ./manager
 
     steps:
-      - name: Checkout
+      - name: Checkout Repository
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
@@ -85,7 +69,7 @@ jobs:
             echo "UPLOAD=false" >> $GITHUB_OUTPUT
           fi
 
-      - name: Write key
+      - name: Write Key
         run: |
           if [ ! -z "${{ secrets.KEYSTORE }}" ]; then
             {
@@ -106,9 +90,6 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
 
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v3
-
       - name: Download arm64 susfsd
         uses: actions/download-artifact@v4
         with:
@@ -152,19 +133,19 @@ jobs:
           chmod +x gradlew
           ./gradlew clean assembleRelease
 
-      - name: Upload build artifact
+      - name: Upload Build Artifact
         uses: actions/upload-artifact@v4
         with:
-          name: manager
+          name: Manager
           path: manager/app/build/outputs/apk/release/*.apk
 
-      - name: Upload mappings
+      - name: Upload Mappings
         uses: actions/upload-artifact@v4
         with:
-          name: "mappings"
-          path: "manager/app/build/outputs/mapping/release/"
+          name: Mappings
+          path: manager/app/build/outputs/mapping/release/
 
-      - name: Bot session cache
+      - name: Bot Session Cache
         if: steps.need_upload.outputs.UPLOAD == 'true'
         id: bot_session_cache
         uses: actions/cache@v4
@@ -172,7 +153,7 @@ jobs:
           path: scripts/ksunextbot.session
           key: ${{ runner.os }}-bot-session
 
-      - name: Upload to telegram
+      - name: Upload to Telegram
         if: steps.need_upload.outputs.UPLOAD == 'true'
         env:
           API_ID: ${{ secrets.API_ID }}

.github/workflows/clippy.yml

@@ -23,15 +23,26 @@ jobs:
   clippy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - run: rustup update stable
+      - name: Checkout Repository
+        uses: actions/checkout@v4
 
-      - name: Install cross
-        run: cargo install cross --git https://github.com/cross-rs/cross --rev 66845c1
+      - name: Setup Rust
+        run: rustup update stable
 
-      - name: Run clippy
+      - name: Setup Cross
+        run: RUSTFLAGS="" cargo install cross
+
+      - name: Cache ksud_overlayfs
+        uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: userspace/ksud_overlayfs
+
+      - name: Cache ksud_magic
+        uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: userspace/ksud_magic
+
+      - name: Run Clippy
         run: |
           cross clippy --manifest-path userspace/ksud_magic/Cargo.toml --target aarch64-linux-android --release
-          cross clippy --manifest-path userspace/ksud_magic/Cargo.toml --target x86_64-linux-android --release
-          cross clippy --manifest-path userspace/ksud_overlayfs/Cargo.toml --target aarch64-linux-android --release
-          cross clippy --manifest-path userspace/ksud_overlayfs/Cargo.toml --target x86_64-linux-android --release
+          cross clippy --manifest-path userspace/ksud_overlayfs/Cargo.toml --target aarch64-linux-android --release

.github/workflows/ksud.yml

@@ -0,0 +1,79 @@
+name: Build ksud
+on:
+  workflow_call:
+    inputs:
+      target:
+        required: true
+        type: string
+      os:
+        required: false
+        type: string
+        default: ubuntu-latest
+      pack_lkm:
+        required: false
+        type: boolean
+        default: true
+      use_cache:
+        required: false
+        type: boolean
+        default: true
+jobs:
+  build:
+    runs-on: ${{ inputs.os }}
+    steps:
+    - name: Checkout Repository
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+
+    - name: Download Artifacts
+      uses: actions/download-artifact@v4
+
+    - name: Prepare LKM Files
+      if: ${{ inputs.pack_lkm }}
+      run: |
+        cp android*-lkm/*_kernelsu.ko ./userspace/ksud_overlayfs/bin/aarch64/
+        cp android*-lkm/*_kernelsu.ko ./userspace/ksud_magic/bin/aarch64/
+
+    - name: Import susfsd Libraries
+      run: |
+        cp susfsd-aarch64-linux-android/arm64-v8a/susfsd ./userspace/ksud_overlayfs/bin/aarch64/
+        cp susfsd-aarch64-linux-android/arm64-v8a/susfsd ./userspace/ksud_magic/bin/aarch64/
+
+    - name: Setup Rust
+      run: |
+        rustup update stable
+        rustup target add aarch64-apple-darwin
+
+    - name: Cache ksud_overlayfs
+      uses: Swatinem/rust-cache@v2
+      with:
+        workspaces: userspace/ksud_overlayfs
+        cache-targets: false
+
+    - name: Cache ksud_magic
+      uses: Swatinem/rust-cache@v2
+      with:
+        workspaces: userspace/ksud_magic
+        cache-targets: false
+
+    - name: Setup Cross
+      run: |
+        RUSTFLAGS="" cargo install cross --git https://github.com/cross-rs/cross --rev 66845c1 --force
+
+    - name: Build ksud
+      run: |
+        CROSS_NO_WARNINGS=0 cross build --target ${{ inputs.target }} --release --manifest-path ./userspace/ksud_overlayfs/Cargo.toml
+        CROSS_NO_WARNINGS=0 cross build --target ${{ inputs.target }} --release --manifest-path ./userspace/ksud_magic/Cargo.toml
+
+    - name: Upload ksud_overlayfs artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: ksud_overlayfs-${{ inputs.target }}
+        path: userspace/ksud_overlayfs/target/**/release/ksud*
+
+    - name: Upload ksud_magic artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: ksud_magic-${{ inputs.target }}
+        path: userspace/ksud_magic/target/**/release/ksud*

.github/workflows/ksud_magic.yml

@@ -1,61 +0,0 @@
-name: Build ksud_magic
-on:
-  workflow_call:
-    inputs:
-      target:
-        required: true
-        type: string
-      os:
-        required: false
-        type: string
-        default: ubuntu-latest
-      pack_lkm:
-        required: false
-        type: boolean
-        default: true
-      use_cache:
-        required: false
-        type: boolean
-        default: true
-jobs:
-  build:
-    runs-on: ${{ inputs.os }}
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-
-    - name: Download artifacts
-      uses: actions/download-artifact@v4
-    
-    - name: Prepare LKM fies
-      if: ${{ inputs.pack_lkm }}
-      run: |
-        cp android*-lkm/*_kernelsu.ko ./userspace/ksud_magic/bin/aarch64/
-
-    - name: Import susfsd lib
-      run: |
-        cp susfsd-aarch64-linux-android/arm64-v8a/susfsd ./userspace/ksud_magic/bin/aarch64/
-        
-    - name: Setup rustup
-      run: |
-        rustup update stable
-        rustup target add x86_64-apple-darwin
-        rustup target add aarch64-apple-darwin
-    - uses: Swatinem/rust-cache@v2
-      with:
-        workspaces: userspace/ksud_magic
-        cache-targets: false
-
-    - name: Install cross
-      run: |
-        cargo install cross --git https://github.com/cross-rs/cross --rev 66845c1 --force
-
-    - name: Build ksud_magic
-      run: CROSS_NO_WARNINGS=0 cross build --target ${{ inputs.target }} --release --manifest-path ./userspace/ksud_magic/Cargo.toml
-
-    - name: Upload ksud_magic artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: ksud_magic-${{ inputs.target }}
-        path: userspace/ksud_magic/target/**/release/ksud*

.github/workflows/ksud_overlayfs.yml

@@ -1,61 +0,0 @@
-name: Build ksud_overlayfs
-on:
-  workflow_call:
-    inputs:
-      target:
-        required: true
-        type: string
-      os:
-        required: false
-        type: string
-        default: ubuntu-latest
-      pack_lkm:
-        required: false
-        type: boolean
-        default: true
-      use_cache:
-        required: false
-        type: boolean
-        default: true
-jobs:
-  build:
-    runs-on: ${{ inputs.os }}
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-
-    - name: Download artifacts
-      uses: actions/download-artifact@v4
-    
-    - name: Prepare LKM fies
-      if: ${{ inputs.pack_lkm }}
-      run: |
-        cp android*-lkm/*_kernelsu.ko ./userspace/ksud_overlayfs/bin/aarch64/
-
-    - name: Import susfsd lib
-      run: |
-        cp susfsd-aarch64-linux-android/arm64-v8a/susfsd ./userspace/ksud_overlayfs/bin/aarch64/
-        
-    - name: Setup rustup
-      run: |
-        rustup update stable
-        rustup target add x86_64-apple-darwin
-        rustup target add aarch64-apple-darwin
-    - uses: Swatinem/rust-cache@v2
-      with:
-        workspaces: userspace/ksud_overlayfs
-        cache-targets: false
-
-    - name: Install cross
-      run: |
-        cargo install cross --git https://github.com/cross-rs/cross --rev 66845c1 --force
-
-    - name: Build ksud_overlayfs
-      run: CROSS_NO_WARNINGS=0 cross build --target ${{ inputs.target }} --release --manifest-path ./userspace/ksud_overlayfs/Cargo.toml
-
-    - name: Upload ksud_overlayfs artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: ksud_overlayfs-${{ inputs.target }}
-        path: userspace/ksud_overlayfs/target/**/release/ksud*

.github/workflows/release.yml

@@ -27,6 +27,7 @@ jobs:
       - build-a12-kernel
       - build-a13-kernel
       - build-a14-kernel
+      - build-a15-kernel
     runs-on: ubuntu-latest
     steps:
       - name: Download artifacts
@@ -53,4 +54,4 @@ jobs:
             boot-images-*/Image-*/*.img.gz
             ksud_magic-*
             ksud_overlayfs-*
-            susfsd-*
+            susfsd-*