Jelajahi Sumber

fix(action): update matrix generation logic for variant handling in workflows

TheWildJames 4 bulan lalu
induk
melakukan
4e4035dd68
2 mengubah file dengan 10 tambahan dan 2 penghapusan
  1. 1 2
      .github/workflows/build.yml
  2. 9 0
      .github/workflows/prepare.yml

+ 1 - 2
.github/workflows/build.yml

@@ -33,8 +33,7 @@ jobs:
     name: "${{ inputs.kernel_version }} (${{ matrix.variant }})"
     name: "${{ inputs.kernel_version }} (${{ matrix.variant }})"
     strategy:
     strategy:
       fail-fast: false
       fail-fast: false
-      matrix:
-        variant: ${{ inputs.variant == 'All' && fromJson('["Normal","Bypass","Wild"]') || fromJson(format('["{0}"]', inputs.variant)) }}
+      matrix: ${{ fromJson(needs.setup.outputs.matrix) }}
     runs-on: ubuntu-latest
     runs-on: ubuntu-latest
     timeout-minutes: 60
     timeout-minutes: 60
 
 

+ 9 - 0
.github/workflows/prepare.yml

@@ -64,6 +64,15 @@ jobs:
           
           
           echo "Matrix content: $MATRIX_JSON"
           echo "Matrix content: $MATRIX_JSON"
           echo "matrix=$MATRIX_JSON" >> $GITHUB_OUTPUT
           echo "matrix=$MATRIX_JSON" >> $GITHUB_OUTPUT
+      
+      - name: Build matrix
+        id: matrix
+        run: |
+          if [ "${{ inputs.variant }}" = "All" ]; then
+            echo "matrix={\"variant\":[\"Normal\",\"Bypass\",\"Wild\"]}" >> "$GITHUB_OUTPUT"
+          else
+            echo "matrix={\"variant\":[\"${{ inputs.variant }}\"]}" >> "$GITHUB_OUTPUT"
+          fi
 
 
   build:
   build:
     needs: generate-matrix
     needs: generate-matrix