瀏覽代碼

refactor: add per-branch SUSFS commit inputs (one per android/kernel version)

- Replaced single susfs_commit with 7 per-branch inputs
- Each build job now passes its own susfs_commit_<version> input
- Summary shows all 7 SUSFS commits
TheWildJames 2 月之前
父節點
當前提交
63d4fb69e0
共有 1 個文件被更改,包括 49 次插入12 次删除
  1. 49 12
      .github/workflows/main.yml

+ 49 - 12
.github/workflows/main.yml

@@ -49,8 +49,38 @@ on:
         type: string
         required: false
         default: ""
-      susfs_commit:
-        description: "SUSFS commit hash (empty = latest on auto-derived gki-{version} branch)"
+      susfs_commit_android12-5-10:
+        description: "SUSFS commit for android12-5.10 (empty = latest branch tip)"
+        type: string
+        required: false
+        default: ""
+      susfs_commit_android13-5-10:
+        description: "SUSFS commit for android13-5.10 (empty = latest branch tip)"
+        type: string
+        required: false
+        default: ""
+      susfs_commit_android13-5-15:
+        description: "SUSFS commit for android13-5.15 (empty = latest branch tip)"
+        type: string
+        required: false
+        default: ""
+      susfs_commit_android14-5-15:
+        description: "SUSFS commit for android14-5.15 (empty = latest branch tip)"
+        type: string
+        required: false
+        default: ""
+      susfs_commit_android14-6-1:
+        description: "SUSFS commit for android14-6.1 (empty = latest branch tip)"
+        type: string
+        required: false
+        default: ""
+      susfs_commit_android15-6-6:
+        description: "SUSFS commit for android15-6.6 (empty = latest branch tip)"
+        type: string
+        required: false
+        default: ""
+      susfs_commit_android16-6-12:
+        description: "SUSFS commit for android16-6.12 (empty = latest branch tip)"
         type: string
         required: false
         default: ""
@@ -67,17 +97,17 @@ jobs:
       config_file: .github/config/android12-5.10.json
       feature_set: ${{ inputs.feature_set || 'FULL' }}
       ksu_branch: ${{ inputs.ksu_branch }}
-      susfs_commit: ${{ inputs.susfs_commit }}
+      susfs_commit: ${{ inputs.susfs_commit_android12-5-10 }}
     secrets: inherit
 
   build-android13-5-10:
-    if: ${{ !inputs.test_release_notes && (inputs.kernel_build_version == 'All' || inputs.kernel_build_version == 'android13-5.10') }}
+    if: ${{ !inputs.test_release_notes && (inputs.kernel_build_version == 'All' || inputs.kernel_build_version == 'android13-5-10') }}
     uses: ./.github/workflows/prepare.yml
     with:
       config_file: .github/config/android13-5.10.json
       feature_set: ${{ inputs.feature_set || 'FULL' }}
       ksu_branch: ${{ inputs.ksu_branch }}
-      susfs_commit: ${{ inputs.susfs_commit }}
+      susfs_commit: ${{ inputs.susfs_commit_android13-5-10 }}
     secrets: inherit
 
   build-android13-5-15:
@@ -87,17 +117,17 @@ jobs:
       config_file: .github/config/android13-5.15.json
       feature_set: ${{ inputs.feature_set || 'FULL' }}
       ksu_branch: ${{ inputs.ksu_branch }}
-      susfs_commit: ${{ inputs.susfs_commit }}
+      susfs_commit: ${{ inputs.susfs_commit_android13-5-15 }}
     secrets: inherit
 
   build-android14-5-15:
-    if: ${{ !inputs.test_release_notes && (inputs.kernel_build_version == 'All' || inputs.kernel_build_version == 'android14-5.15') }}
+    if: ${{ !inputs.test_release_notes && (inputs.kernel_build_version == 'All' || inputs.kernel_build_version == 'android14-5-15') }}
     uses: ./.github/workflows/prepare.yml
     with:
       config_file: .github/config/android14-5.15.json
       feature_set: ${{ inputs.feature_set || 'FULL' }}
       ksu_branch: ${{ inputs.ksu_branch }}
-      susfs_commit: ${{ inputs.susfs_commit }}
+      susfs_commit: ${{ inputs.susfs_commit_android14-5-15 }}
     secrets: inherit
 
   build-android14-6-1:
@@ -107,7 +137,7 @@ jobs:
       config_file: .github/config/android14-6.1.json
       feature_set: ${{ inputs.feature_set || 'FULL' }}
       ksu_branch: ${{ inputs.ksu_branch }}
-      susfs_commit: ${{ inputs.susfs_commit }}
+      susfs_commit: ${{ inputs.susfs_commit_android14-6-1 }}
     secrets: inherit
 
   build-android15-6-6:
@@ -117,7 +147,7 @@ jobs:
       config_file: .github/config/android15-6.6.json
       feature_set: ${{ inputs.feature_set || 'FULL' }}
       ksu_branch: ${{ inputs.ksu_branch }}
-      susfs_commit: ${{ inputs.susfs_commit }}
+      susfs_commit: ${{ inputs.susfs_commit_android15-6-6 }}
     secrets: inherit
 
   build-android16-6-12:
@@ -127,7 +157,7 @@ jobs:
       config_file: .github/config/android16-6.12.json
       feature_set: ${{ inputs.feature_set || 'FULL' }}
       ksu_branch: ${{ inputs.ksu_branch }}
-      susfs_commit: ${{ inputs.susfs_commit }}
+      susfs_commit: ${{ inputs.susfs_commit_android16-6-12 }}
     secrets: inherit
 
   rej:
@@ -246,7 +276,14 @@ jobs:
           echo
           echo "**Feature Set:** ${{ inputs.feature_set }}"
           echo "**KSU Branch:** ${{ inputs.ksu_branch || 'latest dev' }}"
-          echo "**SUSFS Commit:** ${{ inputs.susfs_commit || 'latest' }}"
+          echo "**SUSFS Commits:**"
+          echo "- android12-5.10: ${{ inputs.susfs_commit_android12-5-10 || 'latest' }}"
+          echo "- android13-5.10: ${{ inputs.susfs_commit_android13-5-10 || 'latest' }}"
+          echo "- android13-5.15: ${{ inputs.susfs_commit_android13-5-15 || 'latest' }}"
+          echo "- android14-5.15: ${{ inputs.susfs_commit_android14-5-15 || 'latest' }}"
+          echo "- android14-6.1: ${{ inputs.susfs_commit_android14-6-1 || 'latest' }}"
+          echo "- android15-6.6: ${{ inputs.susfs_commit_android15-6-6 || 'latest' }}"
+          echo "- android16-6.12: ${{ inputs.susfs_commit_android16-6-12 || 'latest' }}"
           echo
           echo "---"
           echo