Quellcode durchsuchen

fix(susfs): gate pershoot cherry-pick to next flavor only

The top-2 gki-android14-6.1-dev cherry-pick ran for every flavor.
Tiann and ReSukiSU now use the simonpunk checkout as-is.
TheWildJames vor 5 Tagen
Ursprung
Commit
a87afc2271
2 geänderte Dateien mit 11 neuen und 2 gelöschten Zeilen
  1. 10 2
      .github/actions/susfs-patches/action.yml
  2. 1 0
      .github/workflows/build.yml

+ 10 - 2
.github/actions/susfs-patches/action.yml

@@ -4,6 +4,10 @@ inputs:
  nomount:
   description: 'nomount'
   required: true
+ flavor:
+  description: 'root flavor (kernelsu, next, resukisu) - pershoot commits only apply to next'
+  required: false
+  default: ""
  susfs_commit:
   description: 'pinned SUSFS commit (empty = latest tip)'
   required: false
@@ -27,8 +31,12 @@ runs:
       git config --global user.email "41898282+github-actions[bot]@://github.com"
       
       cd susfs4ksu
-      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
+      # Pershoot's gki-android14-6.1-dev commits only apply to KernelSU-Next
+      # (dev-susfs fork). Other flavors use the simonpunk checkout as-is.
+      if [ "${{ inputs.flavor }}" = "next" ]; then
+        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
       
       SUSFS4KSU="$ROOT/susfs4ksu"
       echo "SUSFS4KSU=$SUSFS4KSU" >> $GITHUB_ENV

+ 1 - 0
.github/workflows/build.yml

@@ -298,6 +298,7 @@ jobs:
         uses: ./.github/actions/susfs-patches
         with:
           nomount: ${{ inputs.nomount }}
+          flavor: ${{ inputs.root_flavor }}
           susfs_commit: ${{ steps.susfs-cm.outputs.commit }}
 
       - name: Add Zeromount