Browse Source

ci: remove KernelSU variant support and simplify workflows

remove all references to KernelSU variant (KSU) and simplify workflows to only support WKSU
update build configurations and release process accordingly
TheWildJames 1 year ago
parent
commit
6fcd8c4d0d

+ 27 - 63
.github/workflows/build.yml

@@ -21,9 +21,7 @@ on:
       os_patch_level:
         required: true
         type: string
-      kernelsu_variant:
-        required: true
-        type: string
+
       revision:
         required: false
         type: string
@@ -131,17 +129,8 @@ jobs:
           echo "Changing to configuration directory: $CONFIG..."
           cd "$CONFIG"
       
-          case "${{ inputs.kernelsu_variant }}" in
-            "WKSU")
-              echo "Adding WKSU..."
-              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 -
-              ;;
-
-          esac
+          echo "Adding WKSU..."
+          curl -LSs "https://raw.githubusercontent.com/WildKernels/Wild_KSU/wild/kernel/setup.sh" | bash -s wild
           
       - name: Apply SUSFS Patches for KernelSU Variants
         run: |
@@ -158,55 +147,36 @@ jobs:
           cp ../susfs4ksu/kernel_patches/fs/* ./common/fs/
           cp ../susfs4ksu/kernel_patches/include/linux/* ./common/include/linux/
           
-          case "${{ inputs.kernelsu_variant }}" in
-            "WKSU")
-              echo "Applying SUSFS patches for WKSU..."
-              cd ./Wild_KSU
-              cp ../../susfs4ksu/kernel_patches/KernelSU/10_enable_susfs_for_ksu.patch ./
-              patch -p1 --forward < 10_enable_susfs_for_ksu.patch || true
-              
-              cp ../../kernel_patches/wild/susfs_fix_patches/v1.5.9/fix_core_hook.c.patch ./
-              patch -p1 --forward --fuzz=3 < fix_core_hook.c.patch
-              
-              cp ../../kernel_patches/wild/susfs_fix_patches/v1.5.9/fix_rules.c.patch ./
-              patch -p1 --forward < fix_rules.c.patch
-
-              cp ../../kernel_patches/wild/susfs_fix_patches/v1.5.9/fix_sucompat.c.patch ./
-              patch -p1 --forward < fix_sucompat.c.patch
-
-              cp ../../kernel_patches/wild/susfs_fix_patches/v1.5.9/fix_kernel_compat.c.patch ./
-              patch -p1 --forward < fix_kernel_compat.c.patch
-              ;;
-            "KSU")
-              echo "Applying SUSFS patches for Official KernelSU..."
-              cd ./KernelSU
-              cp ../../susfs4ksu/kernel_patches/KernelSU/10_enable_susfs_for_ksu.patch ./
-              patch -p1 --forward < 10_enable_susfs_for_ksu.patch
-              ;;
+          echo "Applying SUSFS patches for WKSU..."
+          cd ./Wild_KSU
+          cp ../../susfs4ksu/kernel_patches/KernelSU/10_enable_susfs_for_ksu.patch ./
+          patch -p1 --forward < 10_enable_susfs_for_ksu.patch || true
+          
+          cp ../../kernel_patches/wild/susfs_fix_patches/v1.5.9/fix_core_hook.c.patch ./
+          patch -p1 --forward --fuzz=3 < fix_core_hook.c.patch
+          
+          cp ../../kernel_patches/wild/susfs_fix_patches/v1.5.9/fix_rules.c.patch ./
+          patch -p1 --forward < fix_rules.c.patch
 
+          cp ../../kernel_patches/wild/susfs_fix_patches/v1.5.9/fix_sucompat.c.patch ./
+          patch -p1 --forward < fix_sucompat.c.patch
 
-          esac
+          cp ../../kernel_patches/wild/susfs_fix_patches/v1.5.9/fix_kernel_compat.c.patch ./
+          patch -p1 --forward < fix_kernel_compat.c.patch
 
       - name: Getting KernelSU Version
         run: |
           echo "Changing to configuration directory: $CONFIG..."
           cd "$CONFIG"
           
-          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
+          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)
           
           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"
@@ -252,9 +222,7 @@ jobs:
           # Add KSU configuration settings
           echo "CONFIG_KSU=y" >> ./common/arch/arm64/configs/gki_defconfig
           
-          if [ "${{ inputs.kernelsu_variant }}" == "WKSU" ]; then
-            echo "CONFIG_KSU_KPROBES_HOOK=n" >> ./common/arch/arm64/configs/gki_defconfig
-          fi
+          echo "CONFIG_KSU_KPROBES_HOOK=n" >> ./common/arch/arm64/configs/gki_defconfig
                     
           # Add additional tmpfs config setting
           echo "CONFIG_TMPFS_XATTR=y" >> ./common/arch/arm64/configs/gki_defconfig
@@ -313,11 +281,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 }}" == "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
-          fi
+          echo "CONFIG_KSU_SUSFS_SUS_SU=n" >> ./common/arch/arm64/configs/gki_defconfig
 
       - name: Change Kernel Name
         if: ${{ inputs.use_make == false }}
@@ -325,14 +289,14 @@ jobs:
           cd "$CONFIG"
           if [ -f "build/build.sh" ]; then
               perl -pi -e 's/-dirty//' ./common/scripts/setlocalversion
-              perl -0777 -pi -e 's/(echo "\$res")(?!.*echo "\$res")/echo "\$res-${{ inputs.kernelsu_variant }}-\$KSUVER-SUSFS-v1.5.9-Wild"/s' ./common/scripts/setlocalversion
+              perl -0777 -pi -e 's/(echo "\$res")(?!.*echo "\$res")/echo "\$res-WKSU-\$KSUVER-SUSFS-v1.5.9-Wild"/s' ./common/scripts/setlocalversion
               perl -pi -e 's{UTS_VERSION="\$\(echo \$UTS_VERSION \$CONFIG_FLAGS \$TIMESTAMP \| cut -b -\$UTS_LEN\)"}{UTS_VERSION="#1 SMP PREEMPT Sun Apr 20 04:20:00 UTC 2025"}' ./common/scripts/mkcompile_h
           else
               #Remove -maybe-dirty
               perl -pi -e 's/-maybe-dirty//g' ./build/kernel/kleaf/impl/stamp.bzl
               
               #Set Kernel Name
-              echo "CONFIG_LOCALVERSION=\"-${{ inputs.kernelsu_variant }}-$KSUVER-SUSFS-v1.5.9-Wild\"" >> ./common/arch/arm64/configs/gki_defconfig
+              echo "CONFIG_LOCALVERSION=\"-WKSU-$KSUVER-SUSFS-v1.5.9-Wild\"" >> ./common/arch/arm64/configs/gki_defconfig
 
               #Set Kernel Timestamp
               perl -pi -e 's/build-timestamp = \$\(or \$\(KBUILD_BUILD_TIMESTAMP\), \$\(build-timestamp-auto\)\)/build-timestamp = "Sun Apr 20 04:20:00 UTC 2025"/' ./common/init/Makefile
@@ -503,14 +467,14 @@ jobs:
           
           # Create ZIP file
           cd AnyKernel3
-          ZIP_NAME="${{ inputs.kernelsu_variant }}-$KSUVER-${{ inputs.android_version }}-${{ inputs.kernel_version }}.${{ inputs.sub_level }}-${{ inputs.os_patch_level }}-AnyKernel3.zip"
+          ZIP_NAME="WKSU-$KSUVER-${{ inputs.android_version }}-${{ inputs.kernel_version }}.${{ inputs.sub_level }}-${{ inputs.os_patch_level }}-AnyKernel3.zip"
           echo "Creating zip file: $ZIP_NAME..."
           zip -r "../$ZIP_NAME" ./*
   
       - name: Upload Build Artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ inputs.kernelsu_variant }}-kernel-${{ env.CONFIG }}
+          name: WKSU-kernel-${{ env.CONFIG }}
           path: |
             *.zip
             *.img.gz

+ 2 - 4
.github/workflows/kernel-a12-5-10.yml

@@ -7,9 +7,7 @@ permissions:
 on:
   workflow_call:
     inputs:
-      kernelsu_variant:
-        required: true
-        type: string
+
       use_make:
         required: true
         type: boolean
@@ -58,6 +56,6 @@ jobs:
       sub_level: ${{ matrix.sub_level }}
       os_patch_level: ${{ matrix.os_patch_level }}
       revision: ${{ matrix.revision }}
-      kernelsu_variant: ${{ inputs.kernelsu_variant }}
+
       use_make: ${{ inputs.use_make }}
       

+ 2 - 4
.github/workflows/kernel-a13-5-10.yml

@@ -7,9 +7,7 @@ permissions:
 on:
   workflow_call:
     inputs:
-      kernelsu_variant:
-        required: true
-        type: string
+
       use_make:
         required: true
         type: boolean
@@ -49,5 +47,5 @@ jobs:
       kernel_version: "5.10"
       sub_level: ${{ matrix.sub_level }}
       os_patch_level: ${{ matrix.os_patch_level }}
-      kernelsu_variant: ${{ inputs.kernelsu_variant }}
+
       use_make: ${{ inputs.use_make }}

+ 2 - 4
.github/workflows/kernel-a13-5-15.yml

@@ -7,9 +7,7 @@ permissions:
 on:
   workflow_call:
     inputs:
-      kernelsu_variant:
-        required: true
-        type: string
+
       use_make:
         required: true
         type: boolean
@@ -51,5 +49,5 @@ jobs:
       kernel_version: "5.15"
       sub_level: ${{ matrix.sub_level }}
       os_patch_level: ${{ matrix.os_patch_level }}
-      kernelsu_variant: ${{ inputs.kernelsu_variant }}
+
       use_make: ${{ inputs.use_make }}

+ 2 - 4
.github/workflows/kernel-a14-5-15.yml

@@ -7,9 +7,7 @@ permissions:
 on:
   workflow_call:
     inputs:
-      kernelsu_variant:
-        required: true
-        type: string
+
       use_make:
         required: true
         type: boolean
@@ -49,5 +47,5 @@ jobs:
       kernel_version: "5.15"
       sub_level: ${{ matrix.sub_level }}
       os_patch_level: ${{ matrix.os_patch_level }}
-      kernelsu_variant: ${{ inputs.kernelsu_variant }}
+
       use_make: ${{ inputs.use_make }}

+ 2 - 4
.github/workflows/kernel-a14-6-1.yml

@@ -7,9 +7,7 @@ permissions:
 on:
   workflow_call:
     inputs:
-      kernelsu_variant:
-        required: true
-        type: string
+
       use_make:
         required: true
         type: boolean
@@ -67,5 +65,5 @@ jobs:
       kernel_version: "6.1"
       sub_level: ${{ matrix.sub_level }}
       os_patch_level: ${{ matrix.os_patch_level }}
-      kernelsu_variant: ${{ inputs.kernelsu_variant }}
+
       use_make: ${{ inputs.use_make }}

+ 2 - 4
.github/workflows/kernel-a15-6-6.yml

@@ -7,9 +7,7 @@ permissions:
 on:
   workflow_call:
     inputs:
-      kernelsu_variant:
-        required: true
-        type: string
+
       use_make:
         required: true
         type: boolean
@@ -53,5 +51,5 @@ jobs:
       kernel_version: "6.6"
       sub_level: ${{ matrix.sub_level }}
       os_patch_level: ${{ matrix.os_patch_level }}
-      kernelsu_variant: ${{ inputs.kernelsu_variant }}
+
       use_make: ${{ inputs.use_make }}

+ 17 - 99
.github/workflows/main.yml

@@ -12,15 +12,7 @@ on:
         required: true
         type: boolean
         default: true
-      kernel_variant:
-        description: 'Choose KernelSU Variant'
-        required: true
-        type: choice
-        options:
-          - WKSU
-          - KSU
-          - Both
-        default: WKSU
+
       release_type:
         description: "Choose Release Type"
         required: true
@@ -33,120 +25,52 @@ on:
 
 
 jobs:
-  # WKSU builds
-  build-a12-5-10-wksu:
-    if: ${{ inputs.kernel_variant == 'WKSU' || inputs.kernel_variant == 'Both' }}
+  build-a12-5-10:
     uses: ./.github/workflows/kernel-a12-5-10.yml
     secrets: inherit
     with:
-      kernelsu_variant: WKSU
       use_make: ${{ inputs.use_make }}
 
-  build-a13-5-10-wksu:
-    if: ${{ inputs.kernel_variant == 'WKSU' || inputs.kernel_variant == 'Both' }}
+  build-a13-5-10:
     uses: ./.github/workflows/kernel-a13-5-10.yml
     secrets: inherit
     with:
-      kernelsu_variant: WKSU
       use_make: ${{ inputs.use_make }}
 
-  build-a13-5-15-wksu:
-    if: ${{ inputs.kernel_variant == 'WKSU' || inputs.kernel_variant == 'Both' }}
+  build-a13-5-15:
     uses: ./.github/workflows/kernel-a13-5-15.yml
     secrets: inherit
     with:
-      kernelsu_variant: WKSU
       use_make: ${{ inputs.use_make }}
 
-  build-a14-5-15-wksu:
-    if: ${{ inputs.kernel_variant == 'WKSU' || inputs.kernel_variant == 'Both' }}
+  build-a14-5-15:
     uses: ./.github/workflows/kernel-a14-5-15.yml
     secrets: inherit
     with:
-      kernelsu_variant: WKSU
       use_make: ${{ inputs.use_make }}
 
-  build-a14-6-1-wksu:
-    if: ${{ inputs.kernel_variant == 'WKSU' || inputs.kernel_variant == 'Both' }}
+  build-a14-6-1:
     uses: ./.github/workflows/kernel-a14-6-1.yml
     secrets: inherit
     with:
-      kernelsu_variant: WKSU
       use_make: ${{ inputs.use_make }}
 
-  build-a15-6-6-wksu:
-    if: ${{ inputs.kernel_variant == 'WKSU' || inputs.kernel_variant == 'Both' }}
+  build-a15-6-6:
     uses: ./.github/workflows/kernel-a15-6-6.yml
     secrets: inherit
     with:
-      kernelsu_variant: WKSU
-      use_make: ${{ inputs.use_make }}
-
-  # KSU builds
-  build-a12-5-10-ksu:
-    if: ${{ inputs.kernel_variant == 'KSU' || inputs.kernel_variant == 'Both' }}
-    uses: ./.github/workflows/kernel-a12-5-10.yml
-    secrets: inherit
-    with:
-      kernelsu_variant: KSU
-      use_make: ${{ inputs.use_make }}
-
-  build-a13-5-10-ksu:
-    if: ${{ inputs.kernel_variant == 'KSU' || inputs.kernel_variant == 'Both' }}
-    uses: ./.github/workflows/kernel-a13-5-10.yml
-    secrets: inherit
-    with:
-      kernelsu_variant: KSU
-      use_make: ${{ inputs.use_make }}
-
-  build-a13-5-15-ksu:
-    if: ${{ inputs.kernel_variant == 'KSU' || inputs.kernel_variant == 'Both' }}
-    uses: ./.github/workflows/kernel-a13-5-15.yml
-    secrets: inherit
-    with:
-      kernelsu_variant: KSU
-      use_make: ${{ inputs.use_make }}
-
-  build-a14-5-15-ksu:
-    if: ${{ inputs.kernel_variant == 'KSU' || inputs.kernel_variant == 'Both' }}
-    uses: ./.github/workflows/kernel-a14-5-15.yml
-    secrets: inherit
-    with:
-      kernelsu_variant: KSU
-      use_make: ${{ inputs.use_make }}
-
-  build-a14-6-1-ksu:
-    if: ${{ inputs.kernel_variant == 'KSU' || inputs.kernel_variant == 'Both' }}
-    uses: ./.github/workflows/kernel-a14-6-1.yml
-    secrets: inherit
-    with:
-      kernelsu_variant: KSU
-      use_make: ${{ inputs.use_make }}
-
-  build-a15-6-6-ksu:
-    if: ${{ inputs.kernel_variant == 'KSU' || inputs.kernel_variant == 'Both' }}
-    uses: ./.github/workflows/kernel-a15-6-6.yml
-    secrets: inherit
-    with:
-      kernelsu_variant: KSU
       use_make: ${{ inputs.use_make }}
 
   release:
-    if: ${{ always() && (inputs.release_type == 'Release' || inputs.release_type == 'Pre-Release') && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') }}
+    if: ${{ inputs.release_type == 'Release' || inputs.release_type == 'Pre-Release' }}
     runs-on: ubuntu-latest
     needs:
-      - build-a12-5-10-wksu
-      - build-a13-5-10-wksu
-      - build-a13-5-15-wksu
-      - build-a14-5-15-wksu
-      - build-a14-6-1-wksu
-      - build-a15-6-6-wksu
-      - build-a12-5-10-ksu
-      - build-a13-5-10-ksu
-      - build-a13-5-15-ksu
-      - build-a14-5-15-ksu
-      - build-a14-6-1-ksu
-      - build-a15-6-6-ksu
+      - build-a12-5-10
+      - build-a13-5-10
+      - build-a13-5-15
+      - build-a14-5-15
+      - build-a14-6-1
+      - build-a15-6-6
     env:
       GITHUB_TOKEN: ${{ secrets.MY_GITHUB_TOKEN }}
       RELEASE_NAME: "GKI Kernels With WKSU & SUSFS v1.5.9"
@@ -191,11 +115,7 @@ jobs:
           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: |
@@ -223,7 +143,7 @@ jobs:
       
           Features:
           -> WKSU Kernels & Others
-          -> Multi Manager Support for WKSU Manager & KernelSU Manager (Only Install One)
+          -> Multi Manager Support for WKSU Manager & KernelSU-Next Manager (Only Install One)
           -> SUSFS ඞ v1.5.9
           -> Scope-Minimized Manual hooks v1.4
           -> Magic Mount Support
@@ -243,12 +163,10 @@ jobs:
       
           Managers:
           -> WKSU: https://github.com/WildKernels/Wild_KSU
-          -> KernelSU: https://github.com/tiann/KernelSU
 
       
           Commit Hashes (at the time of release):
           -> WKSU: [${{ env.WKSU_REF }}](${{ env.WKSU_URL }})
-          -> KernelSU: [${{ env.KSU_REF }}](${{ env.KSU_URL }})
 
           -> SUSFS4KSU: 
             -> gki-android12-5.10: [${{ env.COMMIT_HASH_gki_android12_5_10 }}](${{ env.COMMIT_URL_gki_android12_5_10 }})
@@ -294,7 +212,7 @@ jobs:
             ✏️ *Commit:* [${{ github.sha }}](https://github.com/${{ github.repository }}/commit/${{ github.sha }})  
             
             📋 *Release Information:*
-            🔧 *KernelSU Variant:* ${{ inputs.kernel_variant }}
+            🔧 *KernelSU Variant:* WKSU
             
             [🔗 View GitHub Release](https://github.com/${{ github.repository }}/releases/tag/${{ env.NEW_TAG }})" \
             -F parse_mode="Markdown"