diff --git a/README.md b/README.md index b19aff9b..34bbc26c 100644 --- a/README.md +++ b/README.md @@ -11,13 +11,14 @@ Add a step like this to your workflow: ```yaml - name: Commit changes # This is the step name that will be displayed in your runs - uses: EndBug/add-and-commit@v2.0.0 # You can change this to use a specific version + uses: EndBug/add-and-commit@v2.1.0 # You can change this to use a specific version with: # See more info about inputs below author_name: Your Name author_email: mail@example.com message: "Your commit message" path: "." pattern: "*.js" + force: false env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Leave this line unchanged ``` @@ -29,6 +30,7 @@ Add a step like this to your workflow: - `message` : the message for the commit - `path` : the path(s) to stage files from - `pattern` : the pattern that matches file names +- `force` : whether to use the force option on git add, in order to bypass eventual gitignores ### Environment variables: @@ -63,7 +65,7 @@ jobs: run: eslint "src/**" --fix - name: Commit changes - uses: EndBug/add-and-commit@v2.0.0 + uses: EndBug/add-and-commit@v2.1.0 with: author_name: Your Name author_email: mail@example.com diff --git a/action.yml b/action.yml index 1205a00e..1d13a38c 100644 --- a/action.yml +++ b/action.yml @@ -10,6 +10,10 @@ inputs: description: 'The email of the user that will be displayed as the author of the commit' required: true default: 'actions@github.com' + force: + description: 'Whether to use the force option on git add, in order to bypass eventual gitignores' + required: false + default: false message: description: 'The message for the commit' required: true diff --git a/entrypoint.sh b/entrypoint.sh index 9e1b8d84..36b34884 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -19,7 +19,10 @@ EOF } add() { - find $INPUT_PATH -name "$INPUT_PATTERN" | while read x; do git add $x; done + if $INPUT_FORCE + then find $INPUT_PATH -name "$INPUT_PATTERN" | while read x; do git add -f $x; done + else find $INPUT_PATH -name "$INPUT_PATTERN" | while read x; do git add $x; done + fi } # This is needed to make the check work for untracked files