Browse Source

workflows: remove SUSFS input; drop v1.5.9; hardcode SUSFS v1.5.12; always apply BBG; remove BBG matrix

TheWildJames 10 months ago
parent
commit
780ab68d82

+ 34 - 76
.github/workflows/build.yml

@@ -18,10 +18,7 @@ on:
       os_patch_level:
         required: true
         type: string
-      susfs_version:
-        required: false
-        type: string
-        default: "v1.5.12"
+
       # revision input removed; A12 boot image download uses fixed r1
 
 jobs:
@@ -31,7 +28,6 @@ jobs:
       fail-fast: false
       matrix:
         apply_bypass: ["normal", "bypass"]
-        apply_bbg: ["bbg", "no-bbg"]
 
     steps:
       - name: Check Initial Disk Space
@@ -99,58 +95,30 @@ jobs:
           git clone https://github.com/WildKernels/AnyKernel3.git -b "$ANYKERNEL_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 SUSFS v1.5.9 if enabled
-          if [ "${{ inputs.susfs_version }}" = "v1.5.9" ]; then
-            cd susfs4ksu
-            case "${{ inputs.android_version }}-${{ inputs.kernel_version }}" in
-              "android15-6.6")
-                git checkout 2598fee8963adab11c255bf28521df32912e027f
-                ;;
-              "android14-6.1")
-                git checkout 646cfabce9d5dba5b806e9cbe2c198128ebd0e69
-                ;;
-              "android14-5.15")
-                git checkout ab4d9570a9494a67c290002f3b28e69dd370a0f5
-                ;;
-              "android13-5.15")
-                git checkout a21f265695f2869a6f3fc71a70328aa6d0f4a3ae
-                ;;
-              "android13-5.10")
-                git checkout 8acbd10775a447f546b14c6bded6f476a7f4733f
-                ;;
-              "android12-5.10")
-                git checkout 6f42c0e24e35a6fa0fc43051a5f1e7dfe568e8c2
-                ;;
-            esac
-            cd ..
-          fi
-          
-          # Checkout specific commits for SUSFS v1.5.12 if enabled
-          if [ "${{ inputs.susfs_version }}" = "v1.5.12" ]; then
-            cd susfs4ksu
-            case "${{ inputs.android_version }}-${{ inputs.kernel_version }}" in
-              "android12-5.10")
-                git checkout ed19454a4b5905e6718c9a22fad769b906837931
-                ;;
-              "android13-5.10")
-                git checkout 8919927b63d95e62d33842452b9a60546187fb7b
-                ;;
-              "android13-5.15")
-                git checkout 700b9316b5a1cab174401b57f4198782a17154fb
-                ;;
-              "android14-5.15")
-                git checkout e1b1bba04b3cada700b8fd5bda4cfd4c59de07a2
-                ;;
-              "android14-6.1")
-                git checkout f16560ce8263fbfa9b2f259e9531f72d6fda4e3f
-                ;;
-              "android15-6.6")
-                git checkout c49b1dab205bbc4ef20b120e84c5b7530355961d
-                ;;
-            esac
-            cd ..
-          fi
+
+          # Checkout specific commits for SUSFS v1.5.12
+          cd susfs4ksu
+          case "${{ inputs.android_version }}-${{ inputs.kernel_version }}" in
+            "android12-5.10")
+              git checkout ed19454a4b5905e6718c9a22fad769b906837931
+              ;;
+            "android13-5.10")
+              git checkout 8919927b63d95e62d33842452b9a60546187fb7b
+              ;;
+            "android13-5.15")
+              git checkout 700b9316b5a1cab174401b57f4198782a17154fb
+              ;;
+            "android14-5.15")
+              git checkout e1b1bba04b3cada700b8fd5bda4cfd4c59de07a2
+              ;;
+            "android14-6.1")
+              git checkout f16560ce8263fbfa9b2f259e9531f72d6fda4e3f
+              ;;
+            "android15-6.6")
+              git checkout c49b1dab205bbc4ef20b120e84c5b7530355961d
+              ;;
+          esac
+          cd ..
           
 
       - name: Initialize and Sync Kernel Source
@@ -269,11 +237,7 @@ jobs:
           cd "$CONFIG"
           
           # Apply compatibility fixes
-          if [ "${{ inputs.susfs_version }}" = "v1.5.9" ]; then
-            SUSFS_VERSION="1.5.9"
-          else
-            SUSFS_VERSION="1.5.12"
-          fi
+          SUSFS_VERSION="1.5.12"
 
           cp ../susfs4ksu/kernel_patches/fs/* ./common/fs/
           cp ../susfs4ksu/kernel_patches/include/linux/* ./common/include/linux/
@@ -345,7 +309,6 @@ jobs:
           fi
 
       - name: Add BBG
-        if: ${{ matrix.apply_bbg == 'bbg' }}
         run: |
           cd "$CONFIG"
           echo "Adding BBG..."
@@ -560,7 +523,7 @@ jobs:
             SUBLEVEL_FOR_NAME="$ACTUAL_SUBLEVEL"
           fi
           # Set artifact name base for consistent naming
-          ARTIFACT_BASE="WKSU-${{ env.KSUVER }}-SUSFS_${{ inputs.susfs_version }}-${{ inputs.android_version }}-${{ inputs.kernel_version }}.${SUBLEVEL_FOR_NAME}-${{ inputs.os_patch_level }}-${{ matrix.apply_bypass == 'bypass' && 'Bypass' || 'Normal' }}${{ matrix.apply_bbg == 'bbg' && '-BBG' || '' }}"
+          ARTIFACT_BASE="WKSU-${{ env.KSUVER }}-SUSFS_v1.5.12-${{ inputs.android_version }}-${{ inputs.kernel_version }}.${SUBLEVEL_FOR_NAME}-${{ inputs.os_patch_level }}-${{ matrix.apply_bypass == 'bypass' && 'Bypass' || 'Normal' }}-BBG"
           echo "ARTIFACT_BASE=$ARTIFACT_BASE" >> $GITHUB_ENV
           echo "FILE_NAME=$ARTIFACT_BASE" >> $GITHUB_ENV
 
@@ -816,7 +779,7 @@ jobs:
           echo "## Build Information" >> $GITHUB_STEP_SUMMARY
           echo "- **Android Version**: ${{ inputs.android_version }}" >> $GITHUB_STEP_SUMMARY
           echo "- **Kernel Version**: ${{ inputs.kernel_version }}.${{ inputs.sub_level }}" >> $GITHUB_STEP_SUMMARY
-          echo "- **BBG Status**: ${{ matrix.apply_bbg }}" >> $GITHUB_STEP_SUMMARY
+          echo "- **BBG**: Installed" >> $GITHUB_STEP_SUMMARY
           echo "- **Bypass Mode**: ${{ matrix.apply_bypass }}" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
 
@@ -830,15 +793,10 @@ jobs:
           
       - name: Add BBG Version
         run: |
-          # Get BBG status
-          if [ "${{ matrix.apply_bbg }}" == "bbg" ]; then
-            cd "$CONFIG/Baseband-guard"
-            BBG_COMMIT=$(git rev-parse HEAD)
-            BBG_URL="https://github.com/vc-teahouse/Baseband-guard/commit/$BBG_COMMIT"
-            echo "- **Baseband-guard**: [$BBG_COMMIT]($BBG_URL)" >> $GITHUB_STEP_SUMMARY
-          else
-            echo "- **Baseband-guard**: Not installed" >> $GITHUB_STEP_SUMMARY
-          fi
+          cd "$CONFIG/Baseband-guard"
+          BBG_COMMIT=$(git rev-parse HEAD)
+          BBG_URL="https://github.com/vc-teahouse/Baseband-guard/commit/$BBG_COMMIT"
+          echo "- **Baseband-guard**: [$BBG_COMMIT]($BBG_URL)" >> $GITHUB_STEP_SUMMARY
           
       - name: Add SUSFS Version
         run: |
@@ -846,7 +804,7 @@ jobs:
           cd "$GITHUB_WORKSPACE/susfs4ksu"
           SUSFS_COMMIT=$(git rev-parse HEAD)
           SUSFS_URL="https://gitlab.com/simonpunk/susfs4ksu/-/commit/$SUSFS_COMMIT"
-          echo "- **SUSFS4KSU (${{ inputs.susfs_version }})**: [$SUSFS_COMMIT]($SUSFS_URL)" >> $GITHUB_STEP_SUMMARY
+          echo "- **SUSFS4KSU (v1.5.12)**: [$SUSFS_COMMIT]($SUSFS_URL)" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
       
       - name: Add Build Artifacts
@@ -866,4 +824,4 @@ jobs:
           echo "- **Kernel Image (LZ4)**: [${{ env.FILE_NAME }}-Image.lz4](${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID})" >> $GITHUB_STEP_SUMMARY
           
           echo "### Diagnostics" >> $GITHUB_STEP_SUMMARY
-          echo "- **Rejected Patches**: [${{ env.FILE_NAME }}-Rejected-Patches](${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID})" >> $GITHUB_STEP_SUMMARY
+          echo "- **Rejected Patches**: [${{ env.FILE_NAME }}-Rejected-Patches](${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID})" >> $GITHUB_STEP_SUMMARY

+ 1 - 6
.github/workflows/kernel-a12-5-10.yml

@@ -6,11 +6,7 @@ permissions:
 
 on:
   workflow_call:
-    inputs:
-      susfs_version:
-        required: false
-        type: string
-        default: "v1.5.12"
+    inputs: {}
 
 jobs:
   build-kernels-a12:
@@ -100,5 +96,4 @@ jobs:
       kernel_version: "5.10"
       sub_level: ${{ matrix.sub_level }}
       os_patch_level: ${{ matrix.os_patch_level }}
-      susfs_version: ${{ inputs.susfs_version }}
 

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

@@ -6,11 +6,7 @@ permissions:
 
 on:
   workflow_call:
-    inputs:
-      susfs_version:
-        required: false
-        type: string
-        default: "v1.5.12"
+    inputs: {}
 
 jobs:
   build-kernels-a13-5-10:
@@ -99,5 +95,4 @@ jobs:
       android_version: "android13"
       kernel_version: "5.10"
       sub_level: ${{ matrix.sub_level }}
-      os_patch_level: ${{ matrix.os_patch_level }}
-      susfs_version: ${{ inputs.susfs_version }}
+      os_patch_level: ${{ matrix.os_patch_level }}

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

@@ -6,11 +6,7 @@ permissions:
 
 on:
   workflow_call:
-    inputs:
-      susfs_version:
-        required: false
-        type: string
-        default: "v1.5.12"
+    inputs: {}
 
 jobs:
   build-kernels-a13-5-15:
@@ -94,5 +90,4 @@ jobs:
       android_version: "android13"
       kernel_version: "5.15"
       sub_level: ${{ matrix.sub_level }}
-      os_patch_level: ${{ matrix.os_patch_level }}
-      susfs_version: ${{ inputs.susfs_version }}
+      os_patch_level: ${{ matrix.os_patch_level }}

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

@@ -6,11 +6,7 @@ permissions:
 
 on:
   workflow_call:
-    inputs:
-      susfs_version:
-        required: false
-        type: string
-        default: "v1.5.12"
+    inputs: {}
 
 jobs:
   build-kernels-a14-5-15:
@@ -64,5 +60,4 @@ jobs:
       android_version: "android14"
       kernel_version: "5.15"
       sub_level: ${{ matrix.sub_level }}
-      os_patch_level: ${{ matrix.os_patch_level }}
-      susfs_version: ${{ inputs.susfs_version }}
+      os_patch_level: ${{ matrix.os_patch_level }}

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

@@ -6,11 +6,7 @@ permissions:
 
 on:
   workflow_call:
-    inputs:
-      susfs_version:
-        required: false
-        type: string
-        default: "v1.5.12"
+    inputs: {}
 
 jobs:
   build-kernels-a14-6-1:
@@ -82,5 +78,4 @@ jobs:
       android_version: "android14"
       kernel_version: "6.1"
       sub_level: ${{ matrix.sub_level }}
-      os_patch_level: ${{ matrix.os_patch_level }}
-      susfs_version: ${{ inputs.susfs_version }}
+      os_patch_level: ${{ matrix.os_patch_level }}

+ 1 - 6
.github/workflows/kernel-a15-6-6.yml

@@ -6,11 +6,7 @@ permissions:
 
 on:
   workflow_call:
-    inputs:
-      susfs_version:
-        required: false
-        type: string
-        default: "v1.5.12"
+    inputs: {}
 
 jobs:
   build-kernels-a15:
@@ -59,4 +55,3 @@ jobs:
       kernel_version: "6.6"
       sub_level: ${{ matrix.sub_level }}
       os_patch_level: ${{ matrix.os_patch_level }}
-      susfs_version: ${{ inputs.susfs_version }}

+ 3 - 16
.github/workflows/kernel-build-check.yml

@@ -6,21 +6,9 @@ permissions:
 
 on:
   workflow_dispatch:
-    inputs:
-      susfs_version:
-        description: 'SUSFS Version'
-        required: false
-        type: choice
-        options:
-          - 'v1.5.9'
-          - 'v1.5.12'
-        default: 'v1.5.12'
+    inputs: {}
   workflow_call:
-    inputs:
-      susfs_version:
-        required: false
-        type: string
-        default: 'v1.5.12'
+    inputs: {}
 
 jobs:
   build-check:
@@ -107,5 +95,4 @@ jobs:
       android_version: ${{ matrix.kernel_config.android_version }}
       kernel_version: ${{ matrix.kernel_config.kernel_version }}
       sub_level: ${{ matrix.kernel_config.sub_level }}
-      os_patch_level: ${{ matrix.kernel_config.os_patch_level }}
-      susfs_version: ${{ inputs.susfs_version }}
+      os_patch_level: ${{ matrix.kernel_config.os_patch_level }}

+ 14 - 29
.github/workflows/main.yml

@@ -41,14 +41,6 @@ on:
           - Android15-6.6
           - Build Test
         default: All
-      susfs_version:
-        description: "Choose SUSFS version to build"
-        required: true
-        type: choice
-        options:
-          - v1.5.12
-          - v1.5.9
-        default: v1.5.12
 
 jobs:
 
@@ -56,50 +48,43 @@ jobs:
     if: (inputs.build_selection == 'All' || inputs.build_selection == 'Android12-5.10') && inputs.release_type != 'Release (No Artifacts)'
     uses: ./.github/workflows/kernel-a12-5-10.yml
     secrets: inherit
-    with:
-      susfs_version: ${{ inputs.susfs_version }}
+
 
   build-a13-5-10:
     if: (inputs.build_selection == 'All' || inputs.build_selection == 'Android13-5.10') && inputs.release_type != 'Release (No Artifacts)'
     uses: ./.github/workflows/kernel-a13-5-10.yml
     secrets: inherit
-    with:
-      susfs_version: ${{ inputs.susfs_version }}
+
 
   build-a13-5-15:
     if: (inputs.build_selection == 'All' || inputs.build_selection == 'Android13-5.15') && inputs.release_type != 'Release (No Artifacts)'
     uses: ./.github/workflows/kernel-a13-5-15.yml
     secrets: inherit
-    with:
-      susfs_version: ${{ inputs.susfs_version }}
+
 
   build-a14-5-15:
     if: (inputs.build_selection == 'All' || inputs.build_selection == 'Android14-5.15') && inputs.release_type != 'Release (No Artifacts)'
     uses: ./.github/workflows/kernel-a14-5-15.yml
     secrets: inherit
-    with:
-      susfs_version: ${{ inputs.susfs_version }}
+
 
   build-a14-6-1:
     if: (inputs.build_selection == 'All' || inputs.build_selection == 'Android14-6.1') && inputs.release_type != 'Release (No Artifacts)'
     uses: ./.github/workflows/kernel-a14-6-1.yml
     secrets: inherit
-    with:
-      susfs_version: ${{ inputs.susfs_version }}
+
 
   build-a15-6-6:
     if: (inputs.build_selection == 'All' || inputs.build_selection == 'Android15-6.6') && inputs.release_type != 'Release (No Artifacts)'
     uses: ./.github/workflows/kernel-a15-6-6.yml
     secrets: inherit
-    with:
-      susfs_version: ${{ inputs.susfs_version }}
+
 
   build-test:
     if: inputs.build_selection == 'Build Test'
     uses: ./.github/workflows/kernel-build-check.yml
     secrets: inherit
-    with:
-      susfs_version: ${{ inputs.susfs_version }}
+
 
   release:
     runs-on: ubuntu-latest
@@ -220,13 +205,6 @@ jobs:
           - The Problem: Sometimes when installing a custom kernel, the device tries to load a kernel module that fails due to version mismatches, missing dependencies, or signature verification issues. This can cause boot failures or device instability. 
           - The Solution: This version changes one line from false to true to force load the kernel module, bypassing the failure check that would normally prevent loading.
 
-          🔹 BBG (Baseband-guard)
-          - A lightweight LSM (Linux Security Module) for Android kernel
-          - Blocks unauthorized writes to critical partitions/device nodes
-          - Prevents malicious tampering with baseband and boot chain
-          - Kernel-level protection via LSM hooks
-          - Reduces risk of soft-brick/hard-brick issues
-
           Features:
           -> Wild KSU
           -> Multi Manager Support for WKSU, KernelSU-Next! Needs Testing: KSU, MKSU RKSU, xxKSU, KowSU and SukiSU (Best compatibility with WKSU, no support will be provided for other managers)
@@ -238,6 +216,13 @@ jobs:
           -> BBR v1 Support
           -> Added BBG support to prevent unauthorised writes to certain partitions: https://github.com/vc-teahouse/Baseband-guard
 
+          🔹 BBG (Baseband-guard)
+          - A lightweight LSM (Linux Security Module) for Android kernel
+          - Blocks unauthorized writes to critical partitions/device nodes
+          - Prevents malicious tampering with baseband and boot chain
+          - Kernel-level protection via LSM hooks
+          - Reduces risk of soft-brick/hard-brick issues
+
           Notes:
           -> 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/