Merge pull request #165 from KajSzy/feature/strategy-option

feat: Add strategy-option parameter
carloscastrojumo · Nov 21, 2024 · 06648a8 · 06648a8
2 parents 9fb0af1 + 2bf5623
commit 06648a8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/github-helper.ts b/src/github-helper.ts
@@ -18,6 +18,7 @@ export interface Inputs {
   reviewers: string[]
   teamReviewers: string[]
   cherryPickBranch?: string
+  strategyOption?: string
   force?: boolean
 }
 

diff --git a/src/index.ts b/src/index.ts
@@ -1,10 +1,10 @@
 import * as core from '@actions/core'
-import * as io from '@actions/io'
 import * as exec from '@actions/exec'
-import * as utils from './utils'
 import * as github from '@actions/github'
-import {Inputs, createPullRequest} from './github-helper'
-import {PullRequest} from '@octokit/webhooks-types'
+import * as io from '@actions/io'
+import { PullRequest } from '@octokit/webhooks-types'
+import { Inputs, createPullRequest } from './github-helper'
+import * as utils from './utils'
 
 const CHERRYPICK_EMPTY =
   'The previous cherry-pick is now empty, possibly due to conflict resolution.'
@@ -24,7 +24,8 @@ export async function run(): Promise<void> {
       assignees: utils.getInputAsArray('assignees'),
       reviewers: utils.getInputAsArray('reviewers'),
       teamReviewers: utils.getInputAsArray('team-reviewers'),
-      cherryPickBranch: core.getInput('cherry-pick-branch')
+      cherryPickBranch: core.getInput('cherry-pick-branch'),
+      strategyOption: core.getInput('strategy-option')
     }
 
     core.info(`Cherry pick into branch ${inputs.branch}!`)
@@ -71,7 +72,7 @@ export async function run(): Promise<void> {
       '-m',
       '1',
       '--strategy=recursive',
-      '--strategy-option=theirs',
+      `--strategy-option=${inputs.strategyOption ?? 'theirs'}`,
       `${githubSha}`
     ])
     if (result.exitCode !== 0 && !result.stderr.includes(CHERRYPICK_EMPTY)) {