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

ci: add susfs_version input to kernel workflows

Add susfs_version as an optional input parameter to all kernel build workflows with default value "v1.5.12". This allows centralized version control through the main workflow instead of using matrix strategy in build.yml.

Remove susfs_version from matrix strategy in build.yml since it's now passed as input. Update artifact naming and release description to reflect single version usage.
TheWildJames 11 месяцев назад
Родитель
Сommit
396938d60c

+ 8 - 5
.github/workflows/build.yml

@@ -18,6 +18,10 @@ on:
       os_patch_level:
       os_patch_level:
         required: true
         required: true
         type: string
         type: string
+      susfs_version:
+        required: false
+        type: string
+        default: "v1.5.12"
       # revision input removed; A12 boot image download uses fixed r1
       # revision input removed; A12 boot image download uses fixed r1
 
 
 jobs:
 jobs:
@@ -27,7 +31,6 @@ jobs:
       fail-fast: false
       fail-fast: false
       matrix:
       matrix:
         apply_module_check_bypass: ["normal", "bypass"]
         apply_module_check_bypass: ["normal", "bypass"]
-        susfs_version: ["v1.5.9", "v1.5.12"]
 
 
     steps:
     steps:
       - name: Maximize Build Space
       - name: Maximize Build Space
@@ -88,7 +91,7 @@ jobs:
           git clone https://gitlab.com/simonpunk/susfs4ksu.git -b "$SUSFS_BRANCH"
           git clone https://gitlab.com/simonpunk/susfs4ksu.git -b "$SUSFS_BRANCH"
           
           
           # Checkout specific commits for SUSFS v1.5.9 if enabled
           # Checkout specific commits for SUSFS v1.5.9 if enabled
-          if [ "${{ matrix.susfs_version }}" = "v1.5.9" ]; then
+          if [ "${{ inputs.susfs_version }}" = "v1.5.9" ]; then
             cd susfs4ksu
             cd susfs4ksu
             case "${{ inputs.android_version }}-${{ inputs.kernel_version }}" in
             case "${{ inputs.android_version }}-${{ inputs.kernel_version }}" in
               "android15-6.6")
               "android15-6.6")
@@ -114,7 +117,7 @@ jobs:
           fi
           fi
           
           
           # Checkout specific commits for SUSFS v1.5.12 if enabled
           # Checkout specific commits for SUSFS v1.5.12 if enabled
-          if [ "${{ matrix.susfs_version }}" = "v1.5.12" ]; then
+          if [ "${{ inputs.susfs_version }}" = "v1.5.12" ]; then
             cd susfs4ksu
             cd susfs4ksu
             case "${{ inputs.android_version }}-${{ inputs.kernel_version }}" in
             case "${{ inputs.android_version }}-${{ inputs.kernel_version }}" in
               "android12-5.10")
               "android12-5.10")
@@ -233,7 +236,7 @@ jobs:
           cd "$CONFIG"
           cd "$CONFIG"
           
           
           # Apply compatibility fixes
           # Apply compatibility fixes
-          if [ "${{ matrix.susfs_version }}" = "v1.5.9" ]; then
+          if [ "${{ inputs.susfs_version }}" = "v1.5.9" ]; then
             SUSFS_VERSION="1.5.9"
             SUSFS_VERSION="1.5.9"
           else
           else
             SUSFS_VERSION="1.5.12"
             SUSFS_VERSION="1.5.12"
@@ -466,7 +469,7 @@ jobs:
             SUBLEVEL_FOR_NAME="$ACTUAL_SUBLEVEL"
             SUBLEVEL_FOR_NAME="$ACTUAL_SUBLEVEL"
           fi
           fi
           # Set artifact name base for consistent naming
           # Set artifact name base for consistent naming
-          ARTIFACT_BASE="WKSU-${{ env.KSUVER }}-SUSFS_${{ matrix.susfs_version }}-${{ inputs.android_version }}-${{ inputs.kernel_version }}.${SUBLEVEL_FOR_NAME}-${{ inputs.os_patch_level }}-${{ matrix.apply_module_check_bypass == 'bypass' && 'Module_Check_Bypass' || 'Normal' }}"
+          ARTIFACT_BASE="WKSU-${{ env.KSUVER }}-SUSFS_${{ inputs.susfs_version }}-${{ inputs.android_version }}-${{ inputs.kernel_version }}.${SUBLEVEL_FOR_NAME}-${{ inputs.os_patch_level }}-${{ matrix.apply_module_check_bypass == 'bypass' && 'Module_Check_Bypass' || 'Normal' }}"
           echo "ARTIFACT_BASE=$ARTIFACT_BASE" >> $GITHUB_ENV
           echo "ARTIFACT_BASE=$ARTIFACT_BASE" >> $GITHUB_ENV
           echo "FILE_NAME=$ARTIFACT_BASE" >> $GITHUB_ENV
           echo "FILE_NAME=$ARTIFACT_BASE" >> $GITHUB_ENV
 
 

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

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

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

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

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

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

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

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

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

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

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

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

+ 22 - 2
.github/workflows/main.yml

@@ -39,6 +39,14 @@ on:
           - Android14-6.1
           - Android14-6.1
           - Android15-6.6
           - Android15-6.6
         default: All
         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:
 jobs:
 
 
@@ -46,31 +54,43 @@ jobs:
     if: inputs.build_selection == 'All' || inputs.build_selection == 'Android12-5.10'
     if: inputs.build_selection == 'All' || inputs.build_selection == 'Android12-5.10'
     uses: ./.github/workflows/kernel-a12-5-10.yml
     uses: ./.github/workflows/kernel-a12-5-10.yml
     secrets: inherit
     secrets: inherit
+    with:
+      susfs_version: ${{ inputs.susfs_version }}
 
 
   build-a13-5-10:
   build-a13-5-10:
     if: inputs.build_selection == 'All' || inputs.build_selection == 'Android13-5.10'
     if: inputs.build_selection == 'All' || inputs.build_selection == 'Android13-5.10'
     uses: ./.github/workflows/kernel-a13-5-10.yml
     uses: ./.github/workflows/kernel-a13-5-10.yml
     secrets: inherit
     secrets: inherit
+    with:
+      susfs_version: ${{ inputs.susfs_version }}
 
 
   build-a13-5-15:
   build-a13-5-15:
     if: inputs.build_selection == 'All' || inputs.build_selection == 'Android13-5.15'
     if: inputs.build_selection == 'All' || inputs.build_selection == 'Android13-5.15'
     uses: ./.github/workflows/kernel-a13-5-15.yml
     uses: ./.github/workflows/kernel-a13-5-15.yml
     secrets: inherit
     secrets: inherit
+    with:
+      susfs_version: ${{ inputs.susfs_version }}
 
 
   build-a14-5-15:
   build-a14-5-15:
     if: inputs.build_selection == 'All' || inputs.build_selection == 'Android14-5.15'
     if: inputs.build_selection == 'All' || inputs.build_selection == 'Android14-5.15'
     uses: ./.github/workflows/kernel-a14-5-15.yml
     uses: ./.github/workflows/kernel-a14-5-15.yml
     secrets: inherit
     secrets: inherit
+    with:
+      susfs_version: ${{ inputs.susfs_version }}
 
 
   build-a14-6-1:
   build-a14-6-1:
     if: inputs.build_selection == 'All' || inputs.build_selection == 'Android14-6.1'
     if: inputs.build_selection == 'All' || inputs.build_selection == 'Android14-6.1'
     uses: ./.github/workflows/kernel-a14-6-1.yml
     uses: ./.github/workflows/kernel-a14-6-1.yml
     secrets: inherit
     secrets: inherit
+    with:
+      susfs_version: ${{ inputs.susfs_version }}
 
 
   build-a15-6-6:
   build-a15-6-6:
     if: inputs.build_selection == 'All' || inputs.build_selection == 'Android15-6.6'
     if: inputs.build_selection == 'All' || inputs.build_selection == 'Android15-6.6'
     uses: ./.github/workflows/kernel-a15-6-6.yml
     uses: ./.github/workflows/kernel-a15-6-6.yml
     secrets: inherit
     secrets: inherit
+    with:
+      susfs_version: ${{ inputs.susfs_version }}
 
 
   release:
   release:
     runs-on: ubuntu-latest
     runs-on: ubuntu-latest
@@ -85,7 +105,7 @@ jobs:
 
 
     env:
     env:
       GH_TOKEN: ${{ github.token }}
       GH_TOKEN: ${{ github.token }}
-      RELEASE_NAME: "!!TESTING!! GKI Kernels With WKSU & SUSFS v1.5.9/v1.5.12 !!!TESTING!!!"
+      RELEASE_NAME: "!!TESTING!! GKI Kernels With WKSU & SUSFS v1.5.12 !!!TESTING!!!"
       RELEASE_BODY: ""
       RELEASE_BODY: ""
     steps:
     steps:
       # # - name: Maximize Build Space
       # # - name: Maximize Build Space
@@ -188,7 +208,7 @@ jobs:
           Features:
           Features:
           -> Wild KSU
           -> 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)
           -> 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)
-          -> SUSFS ඞ v1.5.9/v1.5.12
+          -> SUSFS ඞ v1.5.12
           -> Scope-Minimized Manual hooks v1.4
           -> Scope-Minimized Manual hooks v1.4
           -> Ptrace Patch Support for Older Kernels (<5.16)
           -> Ptrace Patch Support for Older Kernels (<5.16)
           -> IPSet Support for Advanced Network Filtering
           -> IPSet Support for Advanced Network Filtering