Переглянути джерело

fix(action): update feature set default value to 'FULL' for consistency in workflows

TheWildJames 4 місяців тому
батько
коміт
a2aec0c3f7
2 змінених файлів з 19 додано та 19 видалено
  1. 9 9
      .github/workflows/main.yml
  2. 10 10
      .github/workflows/prepare.yml

+ 9 - 9
.github/workflows/main.yml

@@ -38,8 +38,8 @@ on:
           - KSUN+NET
           - BBG
           - None
-          - ALL
-        default: ALL
+          - FULL
+        default: FULL
       ksu_commit:
         description: "KSU Commit (optional)"
         type: string
@@ -82,7 +82,7 @@ jobs:
       anykernel_commit: ${{ needs.fetch-commits.outputs.anykernel_commit }}
       patches_commit: ${{ needs.fetch-commits.outputs.patches_commit }}
       susfs_commit: ${{ needs.fetch-commits.outputs.susfs_commit }}
-      feature_set: ${{ inputs.feature_set || 'ALL' }}
+      feature_set: ${{ inputs.feature_set || 'FULL' }}
       variant: ${{ inputs.variant || 'Normal' }}
     secrets: inherit
 
@@ -96,7 +96,7 @@ jobs:
       anykernel_commit: ${{ needs.fetch-commits.outputs.anykernel_commit }}
       patches_commit: ${{ needs.fetch-commits.outputs.patches_commit }}
       susfs_commit: ${{ needs.fetch-commits.outputs.susfs_commit }}
-      feature_set: ${{ inputs.feature_set || 'ALL' }}
+      feature_set: ${{ inputs.feature_set || 'FULL' }}
       variant: ${{ inputs.variant || 'Normal' }}
     secrets: inherit
 
@@ -110,7 +110,7 @@ jobs:
       anykernel_commit: ${{ needs.fetch-commits.outputs.anykernel_commit }}
       patches_commit: ${{ needs.fetch-commits.outputs.patches_commit }}
       susfs_commit: ${{ needs.fetch-commits.outputs.susfs_commit }}
-      feature_set: ${{ inputs.feature_set || 'ALL' }}
+      feature_set: ${{ inputs.feature_set || 'FULL' }}
       variant: ${{ inputs.variant || 'Normal' }}
     secrets: inherit
 
@@ -124,7 +124,7 @@ jobs:
       anykernel_commit: ${{ needs.fetch-commits.outputs.anykernel_commit }}
       patches_commit: ${{ needs.fetch-commits.outputs.patches_commit }}
       susfs_commit: ${{ needs.fetch-commits.outputs.susfs_commit }}
-      feature_set: ${{ inputs.feature_set || 'ALL' }}
+      feature_set: ${{ inputs.feature_set || 'FULL' }}
       variant: ${{ inputs.variant || 'Normal' }}
     secrets: inherit
 
@@ -138,7 +138,7 @@ jobs:
       anykernel_commit: ${{ needs.fetch-commits.outputs.anykernel_commit }}
       patches_commit: ${{ needs.fetch-commits.outputs.patches_commit }}
       susfs_commit: ${{ needs.fetch-commits.outputs.susfs_commit }}
-      feature_set: ${{ inputs.feature_set || 'ALL' }}
+      feature_set: ${{ inputs.feature_set || 'FULL' }}
       variant: ${{ inputs.variant || 'Normal' }}
     secrets: inherit
 
@@ -152,7 +152,7 @@ jobs:
       anykernel_commit: ${{ needs.fetch-commits.outputs.anykernel_commit }}
       patches_commit: ${{ needs.fetch-commits.outputs.patches_commit }}
       susfs_commit: ${{ needs.fetch-commits.outputs.susfs_commit }}
-      feature_set: ${{ inputs.feature_set || 'ALL' }}
+      feature_set: ${{ inputs.feature_set || 'FULL' }}
       variant: ${{ inputs.variant || 'Normal' }}
     secrets: inherit
 
@@ -166,7 +166,7 @@ jobs:
       anykernel_commit: ${{ needs.fetch-commits.outputs.anykernel_commit }}
       patches_commit: ${{ needs.fetch-commits.outputs.patches_commit }}
       susfs_commit: ${{ needs.fetch-commits.outputs.susfs_commit }}
-      feature_set: ${{ inputs.feature_set || 'ALL' }}
+      feature_set: ${{ inputs.feature_set || 'FULL' }}
       variant: ${{ inputs.variant || 'Normal' }}
     secrets: inherit
 

+ 10 - 10
.github/workflows/prepare.yml

@@ -28,7 +28,7 @@ on:
         required: false
         type: string
       variant:
-        description: "Build Variant (ALL, Normal, Bypass, Wild)"
+        description: "Build Variant (All, Normal, Bypass, Wild)"
         required: false
         type: string
 
@@ -64,16 +64,16 @@ jobs:
           
           echo "Matrix content: $MATRIX_JSON"
 
-            # Filter the matrix by variant input if not ALL
-            if [ "${{ inputs.variant }}" != "" ] && [ "${{ inputs.variant }}" != "ALL" ]; then
-              if command -v jq &> /dev/null; then
-                MATRIX_JSON=$(echo "$MATRIX_JSON" | jq -c --arg v "${{ inputs.variant }}" '[.[] | select(.variant == $v)]')
-              else
-                echo "Warning: jq not found, cannot filter variants."
-              fi
+          # Filter the matrix by variant input if not ALL
+          if [ "${{ inputs.variant }}" != "" ] && [ "${{ inputs.variant }}" != "ALL" ]; then
+            if command -v jq &> /dev/null; then
+              MATRIX_JSON=$(echo "$MATRIX_JSON" | jq -c --arg v "${{ inputs.variant }}" '[.[] | select(.variant == $v)]')
+            else
+              echo "Warning: jq not found, cannot filter variants."
             fi
-            echo "Matrix content: $MATRIX_JSON"
-            echo "matrix=$MATRIX_JSON" >> $GITHUB_OUTPUT
+          fi
+          echo "Matrix content: $MATRIX_JSON"
+          echo "matrix=$MATRIX_JSON" >> $GITHUB_OUTPUT
 
   build:
     needs: generate-matrix