Bennett/add-and-commit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add 'NO-PULL' feature (#150)

Browse Source 
* feat(pull_strategy): add `NO-PULL` option

* fix: add additional NO-PULL debug log
This commit is contained in:
Federico Grandi
2021-03-03 09:00:13 +01:00
committed by GitHub
parent 17b09154e6
commit f5554ef7f0
4 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -39,9 +39,9 @@ Add a step like this to your workflow:
# Default: 'Commit from GitHub Actions (name of the workflow)' # Default: 'Commit from GitHub Actions (name of the workflow)'
message: 'Your commit message' message: 'Your commit message'
# The flag used on the pull strategy # The flag used on the pull strategy. Use NO-PULL to avoid the action pulling at all.
# Default: '--no-rebase' # Default: '--no-rebase'
pull_strategy: '--no-rebase or --no-ff or --rebase' pull_strategy: 'NO-PULL or --no-rebase or --no-ff or --rebase'
# Whether to push the commit and, if any, its tags to the repo. It can also be used to set the git push arguments (see the paragraph below for more info) # Whether to push the commit and, if any, its tags to the repo. It can also be used to set the git push arguments (see the paragraph below for more info)
# Default: true # Default: true

2
action.yml
View File

@@ -25,7 +25,7 @@ inputs:
description: The message for the commit description: The message for the commit
required: false required: false
pull_strategy: pull_strategy:
description: The flag used on the pull strategy description: The flag used on the pull strategy. Use NO-PULL to avoid the action pulling at all.
required: false required: false
default: '--no-rebase' default: '--no-rebase'
push: push:

2
lib/index.js generated
View File

File diff suppressed because one or more lines are too long

26
src/main.ts
View File

@@ -50,15 +50,18 @@ console.log(`Running in ${baseDir}`)
.checkout(getInput('branch'), undefined, log) .checkout(getInput('branch'), undefined, log)
.catch(() => git.checkoutLocalBranch(getInput('branch'), log)) .catch(() => git.checkoutLocalBranch(getInput('branch'), log))
info('> Pulling from remote...') if (getInput('pull_strategy') == 'NO-PULL') info('> Not pulling from repo.')
await git.fetch(undefined, log).pull( else {
undefined, info('> Pulling from remote...')
undefined, await git.fetch(undefined, log).pull(
{ undefined,
[getInput('pull_strategy')]: null undefined,
}, {
log [getInput('pull_strategy')]: null
) },
log
)
}
info('> Re-staging files...') info('> Re-staging files...')
if (getInput('add')) await add({ ignoreErrors: true }) if (getInput('add')) await add({ ignoreErrors: true })
@@ -257,6 +260,11 @@ async function checkInputs() {
} }
// #endregion // #endregion
// #region pull_strategy
if (getInput('pull_strategy') == 'NO-PULL')
debug("NO-PULL found: won't pull from remote.")
// #endregion
// #region push // #region push
if (getInput('push')) { if (getInput('push')) {
// It has to be either 'true', 'false', or any other string (use as arguments) // It has to be either 'true', 'false', or any other string (use as arguments)