[infra] Fix for matrix array generation (#235)

mui · Nov 7, 2024 · 1e3c890 · 1e3c890
1 parent 008ae93
commit 1e3c890
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/prs_create-cherry-pick-pr.yml b/.github/workflows/prs_create-cherry-pick-pr.yml
@@ -44,7 +44,7 @@ jobs:
     if: needs.detect_cherry_pick_targets.outputs.targetBranches != ''
     strategy:
       matrix:
-        branch: ${{ needs.detect_cherry_pick_targets.outputs.targetBranches }}
+        branch: ${{ fromJSON(needs.detect_cherry_pick_targets.outputs.targetBranches) }}
     permissions:
       issues: write
       pull-requests: write

diff --git a/.github/workflows/scripts/prs/detectTargetBranch.js b/.github/workflows/scripts/prs/detectTargetBranch.js
@@ -37,7 +37,7 @@ module.exports = async ({ core, context, github }) => {
       if (vBranchRegex.test(pr.head_ref)) {
         // the branch this is coming from is a version branch, so the cherry-pick target should be master
         core.info('>>> Head Ref is a version branch, setting `master` as target');
-        core.setOutput('TARGET_BRANCHES', 'master');
+        core.setOutput('TARGET_BRANCHES', ['master']);
         return;
       }
 
@@ -61,7 +61,7 @@ module.exports = async ({ core, context, github }) => {
     });
 
     // set the target branches as output to be used as an input for the next step
-    core.setOutput('TARGET_BRANCHES', targetLabels.join(','));
+    core.setOutput('TARGET_BRANCHES', targetLabels);
     core.setOutput('LABELS', ['cherry-pick', ...otherLabels].join(','));
     core.setOutput('REVIEWERS', reviewers.join(','));
   } catch (error) {