Browse Source

ci(susfs): replace patch with git apply for kernel patches

Use git apply -C1 for more robust patching, as it handles context
matching better than patch -p1 -F3. This reduces the chance of
patch application failures in the CI workflow.
TheWildJames 4 months ago
parent
commit
44131b0c85
1 changed files with 1 additions and 1 deletions
  1. 1 1
      .github/actions/susfs/action.yml

+ 1 - 1
.github/actions/susfs/action.yml

@@ -85,7 +85,7 @@ runs:
         cp "${{ github.workspace }}/susfs4ksu/kernel_patches/fs/"* "${{ github.workspace }}/kernel/common/fs/"
         cp "${{ github.workspace }}/susfs4ksu/kernel_patches/include/linux/"* "${{ github.workspace }}/kernel/common/include/linux/"
         cp ${{ github.workspace }}/susfs4ksu/kernel_patches/50_add_susfs_in_gki-${{ inputs.android_version }}-${{ inputs.kernel_version }}.patch ./
-        patch -p1 -F3 < 50_add_susfs_in_gki-${{ inputs.android_version }}-${{ inputs.kernel_version }}.patch || true
+        git apply -C1 < 50_add_susfs_in_gki-${{ inputs.android_version }}-${{ inputs.kernel_version }}.patch || true
 
     - name: Apply KSU SUSFS Patches
       shell: bash