Skip to content

Commit 7d74661

Browse files
committed
fix!: remove pull_strategy
1 parent 52d0964 commit 7d74661

File tree

4 files changed

+4
-18
lines changed

4 files changed

+4
-18
lines changed

action.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,6 @@ inputs:
4646
pull:
4747
description: Arguments for the git pull command. Use NO-PULL to avoid the action pulling at all.
4848
required: false
49-
# Default value currently set in runtime
50-
# default: '--no-rebase'
51-
pull_strategy:
52-
description: The flag used on the pull strategy. Use NO-PULL to avoid the action pulling at all.
53-
required: false
54-
deprecationMessage: The 'pull_strategy' input is deprecated, please use 'pull'
5549
push:
5650
description: Whether to push the commit and, if any, its tags to the repo. It can also be used to set the git push arguments (more info in the README)
5751
required: false

lib/index.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main.ts

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,7 @@ core.info(`Running in ${baseDir}`)
7878
created a new branch, it will use --rebase when the branch already existed
7979
*/
8080
const pull =
81-
getInput('pull') ||
82-
getInput('pull_strategy') ||
83-
(branchType == 'new' ? 'NO-PULL' : '--no-rebase')
81+
getInput('pull') || (branchType == 'new' ? 'NO-PULL' : '--no-rebase')
8482
if (pull == 'NO-PULL') core.info('> Not pulling from repo.')
8583
else {
8684
core.info('> Pulling from remote...')
@@ -372,13 +370,8 @@ async function checkInputs() {
372370
)
373371
// #endregion
374372

375-
// #region pull, pull_strategy [deprecated]
376-
if (getInput('pull') && getInput('pull_strategy'))
377-
throw new Error(
378-
"You can't use both pull and pull_strategy as action inputs. Please remove pull_strategy, which is deprecated."
379-
)
380-
381-
if ([getInput('pull'), getInput('pull_strategy')].includes('NO-PULL'))
373+
// #region pull
374+
if (getInput('pull') == 'NO-PULL')
382375
core.debug("NO-PULL found: won't pull from remote.")
383376
// #endregion
384377

src/util.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ interface InputTypes {
1717
message: string
1818
pathspec_error_handling: 'ignore' | 'exitImmediately' | 'exitAtEnd'
1919
pull: string | undefined
20-
pull_strategy: string | undefined
2120
push: string
2221
remove: string | undefined
2322
tag: string | undefined

0 commit comments

Comments
 (0)