diff --git a/README.md b/README.md index 3b655d1..f8802a8 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,9 @@ Add the following step at the end of your job. commit_message: Apply automatic changes branch: ${{ github.head_ref }} + # Optional git params + commit_options: '--no-verify --signoff' + # Optional glob pattern of files which should be added to the commit file_pattern: src/\*.js env: diff --git a/actions.yml b/action.yml similarity index 73% rename from actions.yml rename to action.yml index b58171f..9ce27e3 100644 --- a/actions.yml +++ b/action.yml @@ -7,6 +7,9 @@ inputs: commit_message: description: Commit message required: true + commit_options: + description: Commit options + required: false branch: description: Branch where changes should be pushed too required: true @@ -18,6 +21,11 @@ inputs: runs: using: 'docker' image: 'Dockerfile' + args: + - ${{ inputs.commit_message }} + - ${{ inputs.commit_options }} + - ${{ inputs.branch }} + - ${{ inputs.file_pattern }} branding: icon: 'git-commit' diff --git a/entrypoint.sh b/entrypoint.sh index 609e9b7..50526fb 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,4 +1,5 @@ #!/bin/sh + set -eu # Set up .netrc file with GitHub credentials @@ -18,7 +19,6 @@ EOF git config --global user.name "GitHub Actions" } - # This section only runs if there have been file changes echo "Checking for uncommitted changes in the git working tree." if ! git diff --quiet @@ -30,15 +30,13 @@ then # Switch to branch from current Workflow run git checkout $INPUT_BRANCH - if [ -z ${INPUT_FILE_PATTERN+x} ]; - then - git add . - else - echo "INPUT_FILE_PATTERN value: $INPUT_FILE_PATTERN"; - git add $INPUT_FILE_PATTERN - fi + echo "INPUT_FILE_PATTERN: ${INPUT_FILE_PATTERN}" - git commit -m "$INPUT_COMMIT_MESSAGE" --author="$GITHUB_ACTOR <$GITHUB_ACTOR@users.noreply.github.com>" + git add "${INPUT_FILE_PATTERN}" + + echo "INPUT_COMMIT_OPTIONS: ${INPUT_COMMIT_OPTIONS}" + + git commit -m "$INPUT_COMMIT_MESSAGE" --author="$GITHUB_ACTOR <$GITHUB_ACTOR@users.noreply.github.com>" ${INPUT_COMMIT_OPTIONS:+"$INPUT_COMMIT_OPTIONS"} git push --set-upstream origin "HEAD:$INPUT_BRANCH" else