Merge pull request #7 from nigeljamesstevenson/update/cherry-pick-onl…

…y-works-on-trunk Update cherry pick workflow to only execute against trunk
nigeljamesstevenson · May 2, 2024 · f540bc3 · f540bc3
2 parents dd85e7b + 780cce2
commit f540bc3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/workflows/cherry-pick.yml b/.github/workflows/cherry-pick.yml
@@ -48,9 +48,9 @@ jobs:
 
                       const isManualTrigger = context.payload.inputs && context.payload.inputs.release_branch && context.payload.inputs.release_branch != null;
 
-                      const isMergedMilestonedIssue = context.payload.issue && context.payload.issue.pull_request != null && context.payload.issue.pull_request.merged_at != null && context.payload.issue.milestone != null;
+                      const isMergedMilestonedIssue = context.payload.issue && context.payload.issue.pull_request != null && context.payload.issue.pull_request.merged_at != null && context.payload.issue.milestone != null && context.payload.issue.pull_request.base.ref == 'trunk';
 
-                      const isMergedMilestonedPR = context.payload.pull_request && context.payload.pull_request != null && context.payload.pull_request.merged == true && context.payload.pull_request.milestone != null;
+                      const isMergedMilestonedPR = context.payload.pull_request && context.payload.pull_request != null && context.payload.pull_request.merged == true && context.payload.pull_request.milestone != null && context.payload.pull_request.base.ref == 'trunk';
 
                       const isBot = context.payload.pull_request && ( context.payload.pull_request.user.login == 'github-actions[bot]' || context.payload.pull_request.user.type == 'Bot' );