瀏覽代碼

ci: remove unused kernelsu_branch params and refactor workflow structure

- Remove obsolete kernelsu_branch and kernelsu_branch_other parameters from all kernel workflows
- Split monolithic build-kernels job into individual kernel version jobs
- Update release job dependencies to match new workflow structure
TheWildJames 1 年之前
父節點
當前提交
08c417a187

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

@@ -10,12 +10,6 @@ on:
       kernelsu_variant:
         required: true
         type: string
-      kernelsu_branch:
-        required: true
-        type: string
-      kernelsu_branch_other:
-        required: false
-        type: string
       use_make:
         required: true
         type: boolean
@@ -65,7 +59,5 @@ jobs:
       os_patch_level: ${{ matrix.os_patch_level }}
       revision: ${{ matrix.revision }}
       kernelsu_variant: ${{ inputs.kernelsu_variant }}
-      kernelsu_branch: ${{ inputs.kernelsu_branch }}
-      kernelsu_branch_other: ${{ inputs.kernelsu_branch_other || '' }}
       use_make: ${{ inputs.use_make }}
       

+ 0 - 8
.github/workflows/kernel-a13-5-10.yml

@@ -10,12 +10,6 @@ on:
       kernelsu_variant:
         required: true
         type: string
-      kernelsu_branch:
-        required: true
-        type: string
-      kernelsu_branch_other:
-        required: false
-        type: string
       use_make:
         required: true
         type: boolean
@@ -56,6 +50,4 @@ jobs:
       sub_level: ${{ matrix.sub_level }}
       os_patch_level: ${{ matrix.os_patch_level }}
       kernelsu_variant: ${{ inputs.kernelsu_variant }}
-      kernelsu_branch: ${{ inputs.kernelsu_branch }}
-      kernelsu_branch_other: ${{ inputs.kernelsu_branch_other || '' }}
       use_make: ${{ inputs.use_make }}

+ 0 - 8
.github/workflows/kernel-a13-5-15.yml

@@ -10,12 +10,6 @@ on:
       kernelsu_variant:
         required: true
         type: string
-      kernelsu_branch:
-        required: true
-        type: string
-      kernelsu_branch_other:
-        required: false
-        type: string
       use_make:
         required: true
         type: boolean
@@ -58,6 +52,4 @@ jobs:
       sub_level: ${{ matrix.sub_level }}
       os_patch_level: ${{ matrix.os_patch_level }}
       kernelsu_variant: ${{ inputs.kernelsu_variant }}
-      kernelsu_branch: ${{ inputs.kernelsu_branch }}
-      kernelsu_branch_other: ${{ inputs.kernelsu_branch_other || '' }}
       use_make: ${{ inputs.use_make }}

+ 0 - 8
.github/workflows/kernel-a14-5-15.yml

@@ -10,12 +10,6 @@ on:
       kernelsu_variant:
         required: true
         type: string
-      kernelsu_branch:
-        required: true
-        type: string
-      kernelsu_branch_other:
-        required: false
-        type: string
       use_make:
         required: true
         type: boolean
@@ -56,6 +50,4 @@ jobs:
       sub_level: ${{ matrix.sub_level }}
       os_patch_level: ${{ matrix.os_patch_level }}
       kernelsu_variant: ${{ inputs.kernelsu_variant }}
-      kernelsu_branch: ${{ inputs.kernelsu_branch }}
-      kernelsu_branch_other: ${{ inputs.kernelsu_branch_other || '' }}
       use_make: ${{ inputs.use_make }}

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

@@ -10,12 +10,6 @@ on:
       kernelsu_variant:
         required: true
         type: string
-      kernelsu_branch:
-        required: true
-        type: string
-      kernelsu_branch_other:
-        required: false
-        type: string
       use_make:
         required: true
         type: boolean
@@ -74,6 +68,4 @@ jobs:
       sub_level: ${{ matrix.sub_level }}
       os_patch_level: ${{ matrix.os_patch_level }}
       kernelsu_variant: ${{ inputs.kernelsu_variant }}
-      use_make: ${{ inputs.use_make }}
-      kernelsu_branch: ${{ inputs.kernelsu_branch }}
-      kernelsu_branch_other: ${{ inputs.kernelsu_branch_other || '' }}
+      use_make: ${{ inputs.use_make }}

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

@@ -10,12 +10,6 @@ on:
       kernelsu_variant:
         required: true
         type: string
-      kernelsu_branch:
-        required: true
-        type: string
-      kernelsu_branch_other:
-        required: false
-        type: string
       use_make:
         required: true
         type: boolean
@@ -59,7 +53,5 @@ jobs:
       kernel_version: "6.6"
       sub_level: ${{ matrix.sub_level }}
       os_patch_level: ${{ matrix.os_patch_level }}
-      use_make: ${{ inputs.use_make }}
       kernelsu_variant: ${{ inputs.kernelsu_variant }}
-      kernelsu_branch: ${{ inputs.kernelsu_branch }}
-      kernelsu_branch_other: ${{ inputs.kernelsu_branch_other || '' }}}
+      use_make: ${{ inputs.use_make }}

+ 60 - 41
.github/workflows/main.yml

@@ -24,47 +24,61 @@ on:
 
 
 jobs:
-  build-kernels:
+  build-a12-5-10:
     strategy:
       matrix:
-        include:
-          - kernel: a12-5-10
-            workflow: ./.github/workflows/kernel-a12-5-10.yml
-            variant: KSU
-          - kernel: a12-5-10
-            workflow: ./.github/workflows/kernel-a12-5-10.yml
-            variant: WKSU
-          - kernel: a13-5-10
-            workflow: ./.github/workflows/kernel-a13-5-10.yml
-            variant: KSU
-          - kernel: a13-5-10
-            workflow: ./.github/workflows/kernel-a13-5-10.yml
-            variant: WKSU
-          - kernel: a13-5-15
-            workflow: ./.github/workflows/kernel-a13-5-15.yml
-            variant: KSU
-          - kernel: a13-5-15
-            workflow: ./.github/workflows/kernel-a13-5-15.yml
-            variant: WKSU
-          - kernel: a14-5-15
-            workflow: ./.github/workflows/kernel-a14-5-15.yml
-            variant: KSU
-          - kernel: a14-5-15
-            workflow: ./.github/workflows/kernel-a14-5-15.yml
-            variant: WKSU
-          - kernel: a14-6-1
-            workflow: ./.github/workflows/kernel-a14-6-1.yml
-            variant: KSU
-          - kernel: a14-6-1
-            workflow: ./.github/workflows/kernel-a14-6-1.yml
-            variant: WKSU
-          - kernel: a15-6-6
-            workflow: ./.github/workflows/kernel-a15-6-6.yml
-            variant: KSU
-          - kernel: a15-6-6
-            workflow: ./.github/workflows/kernel-a15-6-6.yml
-            variant: WKSU
-    uses: ${{ matrix.workflow }}
+        variant: [KSU, WKSU]
+    uses: ./.github/workflows/kernel-a12-5-10.yml
+    secrets: inherit
+    with:
+      kernelsu_variant: ${{ matrix.variant }}
+      use_make: ${{ inputs.use_make }}
+
+  build-a13-5-10:
+    strategy:
+      matrix:
+        variant: [KSU, WKSU]
+    uses: ./.github/workflows/kernel-a13-5-10.yml
+    secrets: inherit
+    with:
+      kernelsu_variant: ${{ matrix.variant }}
+      use_make: ${{ inputs.use_make }}
+
+  build-a13-5-15:
+    strategy:
+      matrix:
+        variant: [KSU, WKSU]
+    uses: ./.github/workflows/kernel-a13-5-15.yml
+    secrets: inherit
+    with:
+      kernelsu_variant: ${{ matrix.variant }}
+      use_make: ${{ inputs.use_make }}
+
+  build-a14-5-15:
+    strategy:
+      matrix:
+        variant: [KSU, WKSU]
+    uses: ./.github/workflows/kernel-a14-5-15.yml
+    secrets: inherit
+    with:
+      kernelsu_variant: ${{ matrix.variant }}
+      use_make: ${{ inputs.use_make }}
+
+  build-a14-6-1:
+    strategy:
+      matrix:
+        variant: [KSU, WKSU]
+    uses: ./.github/workflows/kernel-a14-6-1.yml
+    secrets: inherit
+    with:
+      kernelsu_variant: ${{ matrix.variant }}
+      use_make: ${{ inputs.use_make }}
+
+  build-a15-6-6:
+    strategy:
+      matrix:
+        variant: [KSU, WKSU]
+    uses: ./.github/workflows/kernel-a15-6-6.yml
     secrets: inherit
     with:
       kernelsu_variant: ${{ matrix.variant }}
@@ -74,9 +88,14 @@ jobs:
     if: ${{ inputs.release_type == 'Release' || inputs.release_type == 'Pre-Release' }}
     runs-on: ubuntu-latest
     needs:
-      - build-kernels
+      - 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:
-      GH_TOKEN: ${{ secrets.MY_GITHUB_TOKEN }}
+      GITHUB_TOKEN: ${{ secrets.MY_GITHUB_TOKEN }}
       RELEASE_NAME: "GKI Kernels With WKSU & SUSFS v1.5.9"
       RELEASE_BODY:
     steps: