Ver Fonte

ci(workflows): update susfs4ksu checkout and remove module patch

Add specific commit checkouts for susfs4ksu based on Android/kernel version combinations
Remove commented-out module symbol version fix patch as it's no longer needed
TheWildJames há 11 meses atrás
pai
commit
07c4b3b9c8
1 ficheiros alterados com 24 adições e 12 exclusões
  1. 24 12
      .github/workflows/build.yml

+ 24 - 12
.github/workflows/build.yml

@@ -87,8 +87,20 @@ jobs:
           SUSFS_BRANCH="gki-${{ inputs.android_version }}-${{ inputs.kernel_version }}"
           
           git clone https://github.com/WildKernels/AnyKernel3.git -b "$ANYKERNEL_BRANCH"
-          git clone https://gitlab.com/simonpunk/susfs4ksu.git -b "$SUSFS_BRANCH"
           git clone https://github.com/WildKernels/kernel_patches.git
+          git clone https://gitlab.com/simonpunk/susfs4ksu.git -b "$SUSFS_BRANCH"
+          
+          # Checkout specific commits for certain Android/kernel version combinations
+          if [ "${{ inputs.android_version }}-${{ inputs.kernel_version }}" = "android14-6.1" ]; then
+            cd susfs4ksu
+            git checkout aa9595a7b2f9839f2f4bb990a67abadb2f58b956
+            cd ..
+          elif [ "${{ inputs.android_version }}-${{ inputs.kernel_version }}" = "android13-5.15" ]; then
+            cd susfs4ksu
+            git checkout 4a984c1bd8aa3e27cbac1eb5347c26f047309e11
+            cd ..
+          fi
+          
 
       - name: Initialize and Sync Kernel Source
         run: |
@@ -206,17 +218,17 @@ jobs:
           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 Module Symbol Version Fix Patch
-        run: |
-          if [[ "${{ inputs.kernel_version }}" == "6.1" || "${{ inputs.kernel_version }}" == "6.6" ]]; then
-            cd "$CONFIG/common/kernel/module"
-            #sed -i 's/pr_warn("%s: disagrees about version of symbol %s\\n"/pr_warn("%s: disagrees about version of symbol %s, but ignore...\\n"/' version.c
-            sed -i '/bad_version:/{:a;n;/return 0;/{s/return 0;/return 1;/;b};ba}' version.c
-          else
-            cd "$CONFIG/common/kernel"
-            #sed -i 's/pr_warn("%s: disagrees about version of symbol %s\\n"/pr_warn("%s: disagrees about version of symbol %s, but ignore...\\n"/' module.c
-            sed -i '/bad_version:/{:a;n;/return 0;/{s/return 0;/return 1;/;b};ba}' module.c
-          fi
+      #- name: Apply Module Symbol Version Fix Patch
+      #  run: |
+      #    if [[ "${{ inputs.kernel_version }}" == "6.1" || "${{ inputs.kernel_version }}" == "6.6" ]]; then
+      #      cd "$CONFIG/common/kernel/module"
+      #      #sed -i 's/pr_warn("%s: disagrees about version of symbol %s\\n"/pr_warn("%s: disagrees about version of symbol %s, but ignore...\\n"/' version.c
+      #      sed -i '/bad_version:/{:a;n;/return 0;/{s/return 0;/return 1;/;b};ba}' version.c
+      #    else
+      #      cd "$CONFIG/common/kernel"
+      #      #sed -i 's/pr_warn("%s: disagrees about version of symbol %s\\n"/pr_warn("%s: disagrees about version of symbol %s, but ignore...\\n"/' module.c
+      #      sed -i '/bad_version:/{:a;n;/return 0;/{s/return 0;/return 1;/;b};ba}' module.c
+      #    fi
 
       - name: Fix WiFi and Bluetooth on Samsung 6.6 GKI devices
         if: ${{ ( inputs.kernel_version == '6.6' ) }}