refactor(ci): simplify workflows by removing next variant support

Remove KernelSU-Next variant support and simplify workflow configurations
Update release notes to reflect removed variant and clean up branch handling

.github/workflows/build.yml

@@ -24,12 +24,6 @@ on:
       kernelsu_variant:
         required: true
         type: string
-      kernelsu_branch:
-        required: true
-        type: string
-      kernelsu_branch_other:
-        required: false
-        type: string
       revision:
         required: false
         type: string
@@ -132,31 +126,6 @@ jobs:
           echo "Patching ptrace!"
           patch -p1 -F 3 < "../../kernel_patches/gki_ptrace.patch"
 
-      - name: Determine the branch for KernelSU
-        run: |
-          case "${{ inputs.kernelsu_branch }}" in
-            "Stable")
-              echo "BRANCH=-" >> $GITHUB_ENV
-              ;;
-            "Dev")
-              if [[ "${{ inputs.kernelsu_variant }}" == "KSU" ]]; then
-                echo "BRANCH=-s main" >> $GITHUB_ENV
-              elif [[ "${{ inputs.kernelsu_variant }}" == "NEXT" ]]; then
-                echo "BRANCH=-s next" >> $GITHUB_ENV
-              elif [[ "${{ inputs.kernelsu_variant }}" == "WKSU" ]]; then
-                echo "BRANCH=-s wild" >> $GITHUB_ENV
-              fi
-              ;;
-            "Other")
-              if [[ -n "${{ inputs.kernelsu_branch_other }}" ]]; then
-                echo "BRANCH=-s ${{ inputs.kernelsu_branch_other }}" >> $GITHUB_ENV
-              else
-                echo "Error: Custom branch not provided for 'Other'" >&2
-                exit 1
-              fi
-              ;;
-          esac
-      
       - name: Add KernelSU
         run: |
           echo "Changing to configuration directory: $CONFIG..."
@@ -165,15 +134,11 @@ jobs:
           case "${{ inputs.kernelsu_variant }}" in
             "WKSU")
               echo "Adding WKSU..."
-              curl -LSs "https://raw.githubusercontent.com/WildKernels/Wild_KSU/wild/kernel/setup.sh" | bash ${{ env.BRANCH }}
+              curl -LSs "https://raw.githubusercontent.com/WildKernels/Wild_KSU/wild/kernel/setup.sh" | bash -s wild
               ;;
             "KSU")
               echo "Adding KernelSU Official..."
-              curl -LSs "https://raw.githubusercontent.com/tiann/KernelSU/main/kernel/setup.sh" | bash ${{ env.BRANCH }}
-              ;;
-            "NEXT")
-              echo "Adding KernelSU Next..."
-              curl -LSs "https://raw.githubusercontent.com/KernelSU-Next/KernelSU-Next/next/kernel/setup.sh" | bash ${{ env.BRANCH }}
+              curl -LSs "https://raw.githubusercontent.com/tiann/KernelSU/main/kernel/setup.sh" | bash -
               ;;
 
           esac
@@ -218,27 +183,7 @@ jobs:
               cp ../../susfs4ksu/kernel_patches/KernelSU/10_enable_susfs_for_ksu.patch ./
               patch -p1 --forward < 10_enable_susfs_for_ksu.patch
               ;;
-            "NEXT")
-              echo "Applying SUSFS patches for KernelSU Next..."
-              cd ./KernelSU-Next
-              cp ../../susfs4ksu/kernel_patches/KernelSU/10_enable_susfs_for_ksu.patch ./
-              patch -p1 --forward < 10_enable_susfs_for_ksu.patch || true
-              
-              cp ../../kernel_patches/next/susfs_fix_patches/v1.5.9/fix_apk_sign.c.patch ./
-              patch -p1 --forward < fix_apk_sign.c.patch
-              
-              cp ../../kernel_patches/next/susfs_fix_patches/v1.5.9/fix_core_hook.c.patch ./
-              patch -p1 --forward --fuzz=3 < fix_core_hook.c.patch
-              
-              cp ../../kernel_patches/next/susfs_fix_patches/v1.5.9/fix_rules.c.patch ./
-              patch -p1 --forward < fix_rules.c.patch
 
-              cp ../../kernel_patches/next/susfs_fix_patches/v1.5.9/fix_sucompat.c.patch ./
-              patch -p1 --forward < fix_sucompat.c.patch
-
-              cp ../../kernel_patches/next/susfs_fix_patches/v1.5.9/fix_kernel_compat.c.patch ./
-              patch -p1 --forward < fix_kernel_compat.c.patch
-              ;;
 
           esac
 
@@ -247,42 +192,28 @@ jobs:
           echo "Changing to configuration directory: $CONFIG..."
           cd "$CONFIG"
           
-          case "${{ inputs.kernelsu_variant }}" in
-            "WKSU")
-              echo "Getting KSU Version for WKSU..."
-              cd ./Wild_KSU
-              BASE_VERSION=10200
-              ;;
-            "KSU")
-              echo "Applying SUSFS patches for Official KernelSU..."
-              cd ./KernelSU
-              BASE_VERSION=10200
-              ;;
-            "NEXT")
-              cd ./KernelSU-Next
-              BASE_VERSION=10200
-              ;;
-
-          esac
+          if [[ "${{ inputs.kernelsu_variant }}" == "WKSU" ]]; then
+            echo "Getting KSU Version for WKSU..."
+            cd ./Wild_KSU/kernel
+            BASE_VERSION=10200
+            KSU_VERSION=$(expr $(/usr/bin/git rev-list --count HEAD) "+" $BASE_VERSION)
+          elif [[ "${{ inputs.kernelsu_variant }}" == "KSU" ]]; then
+            echo "Getting KSU Version for Official KernelSU..."
+            # Use the tag version directly for KSU
+            KSU_VERSION="${{ env.KSU_REF }}"
+          fi
           
-          cd ./kernel
-          KSU_VERSION=$(expr $(/usr/bin/git rev-list --count HEAD) "+" $BASE_VERSION)
           echo "KSUVER=$KSU_VERSION" >> $GITHUB_ENV
           
       - name: Apply Hooks Patches
+        if: ${{ inputs.kernelsu_variant == 'WKSU' }}
         run: |
           echo "Changing to configuration directory: $CONFIG..."
           cd "$CONFIG/common"
           
-          if [ "${{ inputs.kernelsu_variant }}" == "NEXT" ]; then
-            echo "Applying hooks for KernelSU-Next..."
-            cp ../../kernel_patches/next/scope_min_manual_hooks_v1.4.patch ./
-            patch -p1 --forward -F 3 < scope_min_manual_hooks_v1.4.patch
-          elif [ "${{ inputs.kernelsu_variant }}" == "WKSU" ]; then
-            echo "Applying hooks for WKSU..."
-            cp ../../kernel_patches/wild/hooks/scope_min_manual_hooks_v1.4.patch ./
-            patch -p1 --forward -F 3 < scope_min_manual_hooks_v1.4.patch
-          fi
+          echo "Applying hooks for WKSU..."
+          cp ../../kernel_patches/wild/hooks/scope_min_manual_hooks_v1.4.patch ./
+          patch -p1 --forward -F 3 < scope_min_manual_hooks_v1.4.patch
 
       - name: Apply Hide Stuff Patches
         run: |
@@ -321,7 +252,7 @@ jobs:
           # Add KSU configuration settings
           echo "CONFIG_KSU=y" >> ./common/arch/arm64/configs/gki_defconfig
           
-          if [ "${{ inputs.kernelsu_variant }}" == "NEXT" ] || [ "${{ inputs.kernelsu_variant }}" == "WKSU" ]; then
+          if [ "${{ inputs.kernelsu_variant }}" == "WKSU" ]; then
             echo "CONFIG_KSU_KPROBES_HOOK=n" >> ./common/arch/arm64/configs/gki_defconfig
           fi
                     
@@ -382,7 +313,7 @@ jobs:
           echo "CONFIG_KSU_SUSFS_SPOOF_CMDLINE_OR_BOOTCONFIG=y" >> ./common/arch/arm64/configs/gki_defconfig
           echo "CONFIG_KSU_SUSFS_OPEN_REDIRECT=y" >> ./common/arch/arm64/configs/gki_defconfig
 
-          if [ "${{ inputs.kernelsu_variant }}" == "NEXT" ] || [ "${{ inputs.kernelsu_variant }}" == "WKSU" ]; then
+          if [ "${{ inputs.kernelsu_variant }}" == "WKSU" ]; then
             echo "CONFIG_KSU_SUSFS_SUS_SU=n" >> ./common/arch/arm64/configs/gki_defconfig
           else
             echo "CONFIG_KSU_SUSFS_SUS_SU=y" >> ./common/arch/arm64/configs/gki_defconfig

.github/workflows/main.yml

@@ -21,96 +21,60 @@ on:
           - Pre-Release
           - Release
         default: Pre-Release
-      kernel_variant:
-        description: 'Choose Kernel Variant'
-        required: true
-        type: choice
-        options:
-          - WKSU
-          - KSU
-          - NEXT
-        default: WKSU
 
-      kernelsu_branch:
-        description: "Choose ksu branch"
-        required: true
-        type: choice
-        options:
-          - Stable
-          - Dev
-          - Other
-        default: Dev
-      kernelsu_branch_other:
-        description: "If 'Other' is selected, specify your custom branch"
-        required: false
-        type: string
-        default: ""
 
 jobs:
-  build-kernels-a12-5-10:
-    uses: ./.github/workflows/kernel-a12-5-10.yml
+  build-kernels:
+    strategy:
+      matrix:
+        include:
+          - kernel: a12-5-10
+            workflow: ./.github/workflows/kernel-a12-5-10.yml
+            variant: KSU
+          - kernel: a12-5-10
+            workflow: ./.github/workflows/kernel-a12-5-10.yml
+            variant: WKSU
+          - kernel: a13-5-10
+            workflow: ./.github/workflows/kernel-a13-5-10.yml
+            variant: KSU
+          - kernel: a13-5-10
+            workflow: ./.github/workflows/kernel-a13-5-10.yml
+            variant: WKSU
+          - kernel: a13-5-15
+            workflow: ./.github/workflows/kernel-a13-5-15.yml
+            variant: KSU
+          - kernel: a13-5-15
+            workflow: ./.github/workflows/kernel-a13-5-15.yml
+            variant: WKSU
+          - kernel: a14-5-15
+            workflow: ./.github/workflows/kernel-a14-5-15.yml
+            variant: KSU
+          - kernel: a14-5-15
+            workflow: ./.github/workflows/kernel-a14-5-15.yml
+            variant: WKSU
+          - kernel: a14-6-1
+            workflow: ./.github/workflows/kernel-a14-6-1.yml
+            variant: KSU
+          - kernel: a14-6-1
+            workflow: ./.github/workflows/kernel-a14-6-1.yml
+            variant: WKSU
+          - kernel: a15-6-6
+            workflow: ./.github/workflows/kernel-a15-6-6.yml
+            variant: KSU
+          - kernel: a15-6-6
+            workflow: ./.github/workflows/kernel-a15-6-6.yml
+            variant: WKSU
+    uses: ${{ matrix.workflow }}
     secrets: inherit
     with:
-      kernelsu_variant: ${{ inputs.kernel_variant }}
-      kernelsu_branch: ${{ inputs.kernelsu_branch }}
-      kernelsu_branch_other: ${{ inputs.kernelsu_branch_other }}
-      use_make: ${{ inputs.use_make }}
-
-  build-kernels-a13-5-10:
-    uses: ./.github/workflows/kernel-a13-5-10.yml
-    secrets: inherit
-    with:
-      kernelsu_variant: ${{ inputs.kernel_variant }}
-      kernelsu_branch: ${{ inputs.kernelsu_branch }}
-      kernelsu_branch_other: ${{ inputs.kernelsu_branch_other }}
-      use_make: ${{ inputs.use_make }}
-
-  build-kernels-a13-5-15:
-    uses: ./.github/workflows/kernel-a13-5-15.yml
-    secrets: inherit
-    with:
-      kernelsu_variant: ${{ inputs.kernel_variant }}
-      kernelsu_branch: ${{ inputs.kernelsu_branch }}
-      kernelsu_branch_other: ${{ inputs.kernelsu_branch_other }}
-      use_make: ${{ inputs.use_make }}
-
-  build-kernels-a14-5-15:
-    uses: ./.github/workflows/kernel-a14-5-15.yml
-    secrets: inherit
-    with:
-      kernelsu_variant: ${{ inputs.kernel_variant }}
-      kernelsu_branch: ${{ inputs.kernelsu_branch }}
-      kernelsu_branch_other: ${{ inputs.kernelsu_branch_other }}
-      use_make: ${{ inputs.use_make }}
-
-  build-kernels-a14-6-1:
-    uses: ./.github/workflows/kernel-a14-6-1.yml
-    secrets: inherit
-    with:
-      kernelsu_variant: ${{ inputs.kernel_variant }}
-      kernelsu_branch: ${{ inputs.kernelsu_branch }}
-      kernelsu_branch_other: ${{ inputs.kernelsu_branch_other }}
-      use_make: ${{ inputs.use_make }}
-
-  build-kernels-a15-6-6:
-    uses: ./.github/workflows/kernel-a15-6-6.yml
-    secrets: inherit
-    with:
-      kernelsu_variant: ${{ inputs.kernel_variant }}
-      kernelsu_branch: ${{ inputs.kernelsu_branch }}
-      kernelsu_branch_other: ${{ inputs.kernelsu_branch_other }}
+      kernelsu_variant: ${{ matrix.variant }}
       use_make: ${{ inputs.use_make }}
 
   release:
     if: ${{ inputs.release_type == 'Release' || inputs.release_type == 'Pre-Release' }}
     runs-on: ubuntu-latest
     needs:
-      - build-kernels-a12-5-10
-      - build-kernels-a13-5-10
-      - build-kernels-a13-5-15
-      - build-kernels-a14-5-15
-      - build-kernels-a14-6-1
-      - build-kernels-a15-6-6
+      - build-kernels
     env:
       GH_TOKEN: ${{ secrets.MY_GITHUB_TOKEN }}
       RELEASE_NAME: "GKI Kernels With WKSU & SUSFS v1.5.9"
@@ -149,26 +113,17 @@ jobs:
 
       - name: Get KernelSU variant refs and links
         run: |
-          BRANCH="${{ inputs.kernelsu_branch }}"
-      
-          get_ref() {
-            local name="$1" repo="$2" path="$3" mode="$4"
-            if [[ "$mode" == "tag" ]]; then
-              ref=$(git ls-remote --tags --sort=-v:refname "$repo" | grep -o 'refs/tags/.*' | cut -d/ -f3 | head -n1)
-              url="https://github.com/$path/releases/tag/$ref"
-            else
-              ref=$(git ls-remote "$repo" HEAD | awk '{print $1}')
-              url="https://github.com/$path/commit/$ref"
-            fi
-            echo "${name}_REF=$ref" >> $GITHUB_ENV
-            echo "${name}_URL=$url" >> $GITHUB_ENV
-          }
-      
-          [[ "$BRANCH" == "Stable" ]] && MODE="tag" || MODE="commit"
-
-          get_ref "WKSU" "https://github.com/WildKernels/Wild_KSU.git" "WildKernels/Wild_KSU" "$MODE"
-          get_ref "KSU" "https://github.com/tiann/KernelSU.git" "tiann/KernelSU" "$MODE"
-          get_ref "NEXT" "https://github.com/KernelSU-Next/KernelSU-Next.git" "KernelSU-Next/KernelSU-Next" "$MODE"
+          # Get WKSU latest commit from wild branch
+          WKSU_REF=$(git ls-remote "https://github.com/WildKernels/Wild_KSU.git" refs/heads/wild | awk '{print $1}')
+          WKSU_URL="https://github.com/WildKernels/Wild_KSU/commit/$WKSU_REF"
+          echo "WKSU_REF=$WKSU_REF" >> $GITHUB_ENV
+          echo "WKSU_URL=$WKSU_URL" >> $GITHUB_ENV
+          
+          # Get KSU latest tag
+          KSU_REF=$(git ls-remote --tags --sort=-v:refname "https://github.com/tiann/KernelSU.git" | grep -o 'refs/tags/.*' | cut -d/ -f3 | head -n1)
+          KSU_URL="https://github.com/tiann/KernelSU/releases/tag/$KSU_REF"
+          echo "KSU_REF=$KSU_REF" >> $GITHUB_ENV
+          echo "KSU_URL=$KSU_URL" >> $GITHUB_ENV
           
       - name: Generate and Create New Tag
         run: |
@@ -196,7 +151,7 @@ jobs:
       
           Features:
           -> WKSU Kernels & Others
-          -> Multi Manager Support for WKSU Manager & KernelSU Next Manager (Only Install One)
+          -> Multi Manager Support for WKSU Manager & KernelSU Manager (Only Install One)
           -> SUSFS ඞ v1.5.9
           -> Scope-Minimized Manual hooks v1.4
           -> Magic Mount Support
@@ -208,8 +163,8 @@ jobs:
           -> BBR Support
       
           Notes:
-          -> WKSU & KernelSU Next, SUS SU Mode 2 will show as disabled or not compatble due to non-kprobe hooks and is not needed anymore!
-          -> Official Kernel Flasher is broken with latest susfs, try https://github.com/fatalcoder524/KernelFlasher/ or https://github.com/libxzr/HorizonKernelFlasher!
+          -> WKSU, SUS SU Mode 2 will show as disabled or not compatble due to non-kprobe hooks and is not needed anymore!
+          -> Official Kernel Flasher is broken with latest susfs, try https://github.com/fatalcoder524/KernelFlasher/
       
           Module: 
           -> https://github.com/sidex15/ksu_module_susfs
@@ -217,12 +172,12 @@ jobs:
           Managers:
           -> WKSU: https://github.com/WildKernels/Wild_KSU
           -> KernelSU: https://github.com/tiann/KernelSU
-          -> KernelSU-Next: https://github.com/KernelSU-Next/KernelSU-Next
+
       
           Commit Hashes (at the time of release):
           -> WKSU: [${{ env.WKSU_REF }}](${{ env.WKSU_URL }})
           -> KernelSU: [${{ env.KSU_REF }}](${{ env.KSU_URL }})
-          -> KernelSU Next: [${{ env.NEXT_REF }}](${{ env.NEXT_URL }})
+
           -> SUSFS4KSU: 
             -> gki-android12-5.10: [${{ env.COMMIT_HASH_gki_android12_5_10 }}](${{ env.COMMIT_URL_gki_android12_5_10 }})
             -> gki-android13-5.10: [${{ env.COMMIT_HASH_gki_android13_5_10 }}](${{ env.COMMIT_URL_gki_android13_5_10 }})