Просмотр исходного кода

ci: remove kernel version-check bypass hack entirely

TheWildJames 1 неделя назад
Родитель
Сommit
9cc2064307

+ 2 - 13
.github/actions/build-kernel/action.yml

@@ -1,9 +1,6 @@
 name: 'Build Kernel'
 description: 'Builds kernel using legacy build.sh or Bazel (kleaf)'
 inputs:
-  bypass:
-    description: 'Whether to add the bypass hack or not'
-    required: true
   version:
     description: 'Kernel config version (e.g., android14-6.1)'
     required: true
@@ -50,20 +47,12 @@ runs:
       set -euo pipefail
       if [ -f "bazel-bin/common/kernel_aarch64/Image" ]; then
         echo "Found Image at bazel-bin/common/kernel_aarch64/Image"
-        if [[ ${{ inputs.bypass }} == "true" ]]; then
-          cp "bazel-bin/common/kernel_aarch64/Image" "${{ github.workspace }}/AnyKernel3/Bypass-Image"
-        else
-          cp "bazel-bin/common/kernel_aarch64/Image" "${{ github.workspace }}/AnyKernel3/Image"
-        fi
+        cp "bazel-bin/common/kernel_aarch64/Image" "${{ github.workspace }}/AnyKernel3/Image"
         exit 0
         fi
       if [ -f "/home/runner/out/dist/Image" ]; then
         echo "Found Image at /home/runner/out/dist/Image"
-        if [[ ${{ inputs.bypass }} == "true" ]]; then
-          cp "/home/runner/out/dist/Image" "${{ github.workspace }}/AnyKernel3/Bypass-Image"
-        else
-          cp "/home/runner/out/dist/Image" "${{ github.workspace }}/AnyKernel3/Image"
-        fi
+        cp "/home/runner/out/dist/Image" "${{ github.workspace }}/AnyKernel3/Image"
         exit 0
       fi
 

+ 0 - 79
.github/actions/build-kernel/patches/bypass.patch

@@ -1,79 +0,0 @@
-diff --git a/anykernel.sh b/anykernel.sh
-index 6a97197..c01bdde 100755
---- a/anykernel.sh
-+++ b/anykernel.sh
-@@ -19,7 +19,7 @@ device.name5=
- supported.versions=
- supported.patchlevels=
- supported.vendorpatchlevels=
--keycheck.timeout=10
-+keycheck.timeout=20
- '; } # end properties
- 
- 
-diff --git a/tools/ak3-core.sh b/tools/ak3-core.sh
-index 9ba26e9..12165c5 100755
---- a/tools/ak3-core.sh
-+++ b/tools/ak3-core.sh
-@@ -1141,3 +1141,60 @@ handle_input() {
- setup_ak;
- 
- do_check_boot_version;
-+
-+# Kernel image selection prompt
-+
-+show_kernel_menu() {
-+    ui_print " "
-+    ui_print "================================"
-+    ui_print "       Kernel Image Mode"
-+    ui_print "================================"
-+    ui_print " "
-+    ui_print "Most users should use Normal Mode."
-+    ui_print " "
-+    ui_print "Bypass Mode is only for devices"
-+    ui_print "that fail to boot due to kernel"
-+    ui_print "module compatibility issues."
-+    ui_print " "
-+    ui_print "IMPORTANT:"
-+    ui_print "Bypass Mode does NOT hide root."
-+    ui_print "It does NOT bypass detection."
-+    ui_print " "
-+    ui_print "--------------------------------"
-+    ui_print "VOL- : Normal Mode (Recommended)"
-+    ui_print "VOL+ : Bypass Mode (Advanced)"
-+    ui_print "--------------------------------"
-+    ui_print " "
-+    ui_print "================================"
-+
-+    handle_input
-+
-+    KEY_RESULT=$(cat /tmp/ak3_key_result 2>/dev/null)
-+
-+    case "$KEY_RESULT" in
-+        KEY_VOLUMEUP)
-+            ui_print " "
-+            ui_print "Selected: Bypass Mode"
-+            ui_print "Using Bypass-Image"
-+            ui_print " "
-+            mv $AKHOME/Bypass-Image $AKHOME/Image
-+            ;;
-+
-+        KEY_VOLUMEDOWN)
-+            ui_print " "
-+            ui_print "Selected: Normal Mode"
-+            ui_print "Using standard Image"
-+            ui_print " "
-+            ;;
-+
-+        TIMEOUT)
-+            ui_print " "
-+            ui_print "Timeout reached."
-+            ui_print "Exiting."
-+            ui_print " "
-+            abort
-+            ;;
-+    esac
-+}
-+
-+show_kernel_menu
-\ No newline at end of file

+ 0 - 11
.github/workflows/main.yml

@@ -19,10 +19,6 @@ on:
         description: "Use ccache/bazel cache (restore/save)"
         type: boolean
         default: true
-      bypass:
-        description: "Apply kernel version-check bypass hack"
-        type: boolean
-        default: false
       kernel_build_version:
         description: "Kernel Version"
         type: choice
@@ -637,7 +633,6 @@ jobs:
       droidspaces_commit: ${{ needs.resolve-sources.outputs.droidspaces_commit }}
       brand_name: ${{ inputs.brand_name }}
       os_patch_level: ${{ inputs.os_patch_level }}
-      bypass: ${{ inputs.bypass }}
       use_cache: ${{ inputs.use_cache }}
     secrets: inherit
 
@@ -666,7 +661,6 @@ jobs:
       droidspaces_commit: ${{ needs.resolve-sources.outputs.droidspaces_commit }}
       brand_name: ${{ inputs.brand_name }}
       os_patch_level: ${{ inputs.os_patch_level }}
-      bypass: ${{ inputs.bypass }}
       use_cache: ${{ inputs.use_cache }}
     secrets: inherit
 
@@ -695,7 +689,6 @@ jobs:
       droidspaces_commit: ${{ needs.resolve-sources.outputs.droidspaces_commit }}
       brand_name: ${{ inputs.brand_name }}
       os_patch_level: ${{ inputs.os_patch_level }}
-      bypass: ${{ inputs.bypass }}
       use_cache: ${{ inputs.use_cache }}
     secrets: inherit
 
@@ -724,7 +717,6 @@ jobs:
       droidspaces_commit: ${{ needs.resolve-sources.outputs.droidspaces_commit }}
       brand_name: ${{ inputs.brand_name }}
       os_patch_level: ${{ inputs.os_patch_level }}
-      bypass: ${{ inputs.bypass }}
       use_cache: ${{ inputs.use_cache }}
     secrets: inherit
 
@@ -753,7 +745,6 @@ jobs:
       droidspaces_commit: ${{ needs.resolve-sources.outputs.droidspaces_commit }}
       brand_name: ${{ inputs.brand_name }}
       os_patch_level: ${{ inputs.os_patch_level }}
-      bypass: ${{ inputs.bypass }}
       use_cache: ${{ inputs.use_cache }}
     secrets: inherit
 
@@ -782,7 +773,6 @@ jobs:
       droidspaces_commit: ${{ needs.resolve-sources.outputs.droidspaces_commit }}
       brand_name: ${{ inputs.brand_name }}
       os_patch_level: ${{ inputs.os_patch_level }}
-      bypass: ${{ inputs.bypass }}
       use_cache: ${{ inputs.use_cache }}
     secrets: inherit
 
@@ -811,7 +801,6 @@ jobs:
       droidspaces_commit: ${{ needs.resolve-sources.outputs.droidspaces_commit }}
       brand_name: ${{ inputs.brand_name }}
       os_patch_level: ${{ inputs.os_patch_level }}
-      bypass: ${{ inputs.bypass }}
       use_cache: ${{ inputs.use_cache }}
     secrets: inherit