Selaa lähdekoodia

fix(susfs): fetch pershoot top-2 live instead of pinned patch files

Drop the kernel_patches 0001/0002 files; cherry-pick the two latest
gki-android14-6.1-dev commits at build time (next flavor only).
TheWildJames 4 päivää sitten
vanhempi
commit
90d7a6c5eb
1 muutettua tiedostoa jossa 6 lisäystä ja 5 poistoa
  1. 6 5
      .github/actions/susfs-setup/action.yml

+ 6 - 5
.github/actions/susfs-setup/action.yml

@@ -50,10 +50,11 @@ runs:
         echo "SUSFS_COMMIT=$SUSFS_COMMIT" >> "$GITHUB_ENV"
         echo "Using SUSFS commit: $SUSFS_COMMIT"
 
-        # Pershoot's two commits (no-features core build, Toolkit coexistence)
-        # only apply to KernelSU-Next (dev-susfs fork). Other flavors use the
-        # simonpunk checkout as-is.
+        # Pershoot's latest two gki-android14-6.1-dev commits (currently the
+        # no-features core build + Toolkit coexistence fixes) only apply to
+        # KernelSU-Next (dev-susfs fork). Other flavors use the simonpunk
+        # checkout as-is.
         if [ "${{ inputs.root_flavor }}" = "next" ]; then
-          patch -p1 < "${{ github.workspace }}/kernel_patches/pershoot/susfs4ksu/0001-pershoot-Allow-core-to-be-built-with-no-features.patch"
-          patch -p1 < "${{ github.workspace }}/kernel_patches/pershoot/susfs4ksu/0002-pershoot-Implement-SuSFS-and-Toolkit-coexistence.patch"
+          git fetch https://gitlab.com/pershoot/susfs4ksu.git gki-android14-6.1-dev || true
+          git log ..FETCH_HEAD --oneline -n 2 | awk '{print $1}' | tac | xargs git cherry-pick 2>/dev/null || true
         fi