even more simple now

Author: michelengelen

.github/workflows/prs_create-cherry-pick-pr.yml

@@ -22,6 +22,7 @@ jobs:
     outputs:
       targetBranches: ${{ steps.detect.outputs.TARGET_BRANCHES }}
       reviewers: ${{ steps.detect.outputs.REVIEWERS }}
+      labels: ${{ steps.detect.outputs.LABELS }}
     steps:
       - name: Check out mui-public repo
         id: checkout
@@ -59,10 +60,13 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         uses: carloscastrojumo/github-cherry-pick-action@503773289f4a459069c832dc628826685b75b4b3 # v1.0.10
         with:
+          # the action will run for each value in matrix.branch
           branch: ${{ matrix.branch }}
           body: 'Cherry-pick of #{old_pull_request_id}'
           cherry-pick-branch: ${{ format('cherry-pick-{0}', github.event.number) }}
           title: '{old_title} (@${{ github.event.pull_request.user.login }})'
+          # assigning the original reviewers to the new PR
           reviewers: ${{ needs.detect_cherry_pick_targets.outputs.reviewers }}
-          labels: |
-            cherry-pick
+          # instead of inheriting labels (including target branch label, etc.), we filter and set the labels explicitly
+          inherit_labels: false
+          labels: ${{ needs.detect_cherry_pick_targets.outputs.labels }}

.github/workflows/scripts/prs/detectTargetBranch.js

@@ -22,10 +22,11 @@ module.exports = async ({ core, context, github }) => {
 
     core.info(`>>> PR fetched: ${pr.number}`);
 
+    const prLabels = pr.labels.map((label) => label.name);
+
     // filter the target labels from the original PR
-    const targetLabels = pr.labels
-      .map((label) => label.name)
-      .filter((label) => vBranchRegex.test(label));
+    const targetLabels = prLabels.filter((label) => vBranchRegex.test(label));
+    const otherLabels = prLabels.filter((label) => !vBranchRegex.test(label));
 
     if (targetLabels.length === 0) {
       // there was no target branch present
@@ -49,25 +50,6 @@ module.exports = async ({ core, context, github }) => {
     const reviewers = pr.requested_reviewers.map((reviewer) => reviewer.login);
     core.info(`>>> Reviewers from original PR: ${reviewers.join(', ')}`);
 
-    // the others will be removed from the PR
-    core.info(`>>> Removing target labels from the original PR`);
-    for (const label of targetLabels) {
-      await github.rest.issues.removeLabel({
-        owner,
-        repo,
-        issue_number: pullNumber,
-        name: label,
-      });
-    }
-
-    core.info(`>>> Removing "needs cherry-pick" label from the original PR`);
-    await github.rest.issues.removeLabel({
-      owner,
-      repo,
-      issue_number: pullNumber,
-      name: 'needs cherry-pick',
-    });
-
     core.info(`>>> Creating explanatory comment on PR`);
     await github.rest.issues.createComment({
       owner,
@@ -78,6 +60,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('LABELS', ['cherry-pick', ...otherLabels].join(','));
     core.setOutput('REVIEWERS', reviewers.join(','));
   } catch (error) {
     core.error(`>>> Workflow failed with: ${error.message}`);