git-auto-commit-action/README.md

432 lines
19 KiB
Markdown
Raw Normal View History

# git-auto-commit Action
2019-06-10 12:30:57 +00:00
2020-05-05 22:00:33 +00:00
> The GitHub Action for committing files for the 80% use case.
2019-06-10 13:32:16 +00:00
2020-10-11 09:47:09 +00:00
<a href="https://github.com/stefanzweifel/git-auto-commit-action/actions?query=workflow%3Atests">
<img src="https://github.com/stefanzweifel/git-auto-commit-action/workflows/tests/badge.svg" alt="">
</a>
2020-09-13 12:11:23 +00:00
2021-05-03 18:54:47 +00:00
A GitHub Action to detect changed files during a Workflow run and to commit and push them back to the GitHub repository.
By default, the commit is made in the name of "GitHub Actions" and co-authored by the user that made the last commit.
2019-06-10 13:32:16 +00:00
2021-02-06 18:11:12 +00:00
If you want to learn more how this Action works under the hood, check out [this article](https://michaelheap.com/git-auto-commit/) by Michael Heap.
2019-06-10 13:32:16 +00:00
## Usage
2020-05-05 22:00:33 +00:00
Add the following step at the end of your job, after other steps that might add or change files.
2019-08-20 19:05:10 +00:00
2020-10-28 19:26:25 +00:00
```yaml
- uses: stefanzweifel/git-auto-commit-action@v4
```
2021-09-26 09:39:31 +00:00
Note that the Action has to be used in a Job that runs on a UNIX system (eg. `ubuntu-latest`).
If you don't use the default permission of the GITHUB_TOKEN, give the Job or Workflow at least the `contents: write` permission.
2021-09-26 09:39:31 +00:00
The following is an extended example with all available options.
2020-10-28 19:26:25 +00:00
2019-08-20 19:05:10 +00:00
```yaml
2020-05-16 11:47:17 +00:00
- uses: stefanzweifel/git-auto-commit-action@v4
2019-08-20 19:05:10 +00:00
with:
# Optional. Commit message for the created commit.
2020-10-28 19:26:25 +00:00
# Defaults to "Apply automatic changes"
2021-05-03 18:22:53 +00:00
commit_message: Automated Change
2020-02-06 19:49:03 +00:00
# Optional. Local and remote branch name where commit is going to be pushed
# to. Defaults to the current branch.
# You might need to set `create_branch: true` if the branch does not exist.
branch: feature-123
2019-10-25 20:18:32 +00:00
# Optional. Options used by `git-commit`.
2021-08-18 18:43:30 +00:00
# See https://git-scm.com/docs/git-commit#_options
commit_options: '--no-verify --signoff'
2021-08-18 18:43:30 +00:00
# Optional glob pattern of files which should be added to the commit
2020-10-28 19:26:25 +00:00
# Defaults to all (.)
2020-07-24 18:44:56 +00:00
# See the `pathspec`-documentation for git
# - https://git-scm.com/docs/git-add#Documentation/git-add.txt-ltpathspecgt82308203
# - https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddefpathspecapathspec
2020-08-22 12:42:29 +00:00
file_pattern: src/*.js tests/*.js *.php
# Optional. Local file path to the repository.
# Defaults to the root of the repository.
repository: .
2020-02-05 19:24:25 +00:00
# Optional commit user and author settings
2022-04-12 18:33:36 +00:00
commit_user_name: My GitHub Actions Bot # defaults to "github-actions[bot]"
commit_user_email: my-github-actions-bot@example.org # defaults to "github-actions[bot]@users.noreply.github.com"
2020-10-28 19:26:25 +00:00
commit_author: Author <actions@github.com> # defaults to author of the commit that triggered the run
2020-03-05 19:31:06 +00:00
# Optional. Tag name being created in the local repository and
# pushed to remtoe repository and defined branch.
2020-03-05 19:31:06 +00:00
tagging_message: 'v1.0.0'
2020-05-16 11:17:00 +00:00
# Optional. Option used by `git-status` to determine if the repository is
# dirty. See https://git-scm.com/docs/git-status#_options
2021-05-03 18:22:53 +00:00
status_options: '--untracked-files=no'
# Optional. Options used by `git-add`.
2021-05-03 18:22:53 +00:00
# See https://git-scm.com/docs/git-add#_options
add_options: '-u'
# Optional. Options used by `git-push`.
2021-05-03 18:22:53 +00:00
# See https://git-scm.com/docs/git-push#_options
2020-05-16 11:17:00 +00:00
push_options: '--force'
2020-06-26 19:07:28 +00:00
2021-05-03 18:22:53 +00:00
# Optional. Disable dirty check and always try to create a commit and push
2020-12-15 19:45:42 +00:00
skip_dirty_check: true
2021-05-03 18:22:53 +00:00
# Optional. Skip internal call to `git fetch`
2021-04-10 15:11:30 +00:00
skip_fetch: true
2022-01-10 00:10:05 +00:00
# Optional. Skip internal call to `git checkout`
skip_checkout: true
2021-05-03 18:22:53 +00:00
# Optional. Prevents the shell from expanding filenames.
# Details: https://www.gnu.org/software/bash/manual/html_node/Filename-Expansion.html
2021-04-10 15:11:30 +00:00
disable_globbing: true
# Optional. Create given branch name in local and remote repository.
create_branch: true
2019-08-20 19:05:10 +00:00
```
2021-07-13 18:18:17 +00:00
Please note that the Action depends on `bash`. If you're using the Action in a job in combination with a custom Docker container, make sure that `bash` is installed.
2021-05-03 18:54:47 +00:00
## Example Workflow
2020-05-05 22:00:33 +00:00
In this example, we're running `php-cs-fixer` in a PHP project to fix the codestyle automatically, then commit possible changed files back to the repository.
2020-05-05 22:00:33 +00:00
Note that we explicitly specify `${{ github.head_ref }}` in the checkout Action.
2020-05-05 22:00:33 +00:00
This is required in order to work with the `pull_request` event (or any other non-`push` event).
```yaml
name: php-cs-fixer
on:
pull_request:
push:
branches:
2022-02-27 10:18:39 +00:00
- main
2020-05-05 22:00:33 +00:00
jobs:
php-cs-fixer:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
ref: ${{ github.head_ref }}
- name: Run php-cs-fixer
uses: docker://oskarstark/php-cs-fixer-ga
2020-05-16 11:47:17 +00:00
- uses: stefanzweifel/git-auto-commit-action@v4
2020-05-05 22:00:33 +00:00
with:
commit_message: Apply php-cs-fixer changes
```
2019-08-20 19:05:10 +00:00
2020-07-24 18:22:18 +00:00
## Inputs
Checkout [`action.yml`](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/action.yml) for a full list of supported inputs.
## Outputs
You can use these outputs to trigger other Actions in your Workflow run based on the result of `git-auto-commit-action`.
- `changes_detected`: Returns either "true" or "false" if the repository was dirty and files have changed.
- `commit_hash`: Returns the full hash of the commit if one was created.
2020-07-24 18:22:18 +00:00
2020-10-05 17:47:23 +00:00
### Example
```yaml
- name: "Run if changes have been detected"
if: steps.auto-commit-action.outputs.changes_detected == 'true'
2020-10-05 17:47:23 +00:00
run: echo "Changes!"
- name: "Run if no changes have been detected"
if: steps.auto-commit-action.outputs.changes_detected == 'false'
2020-10-05 17:47:23 +00:00
run: echo "No Changes!"
```
## Limitations & Gotchas
2019-09-22 12:52:33 +00:00
2021-08-18 18:43:30 +00:00
The goal of this Action is to be "the Action for committing files for the 80% use case". Therefore you might run into issues if your Workflow falls into the not supported 20% portion.
The following is a list of edge cases the Action knowingly does not support:
**No `git pull` when the repository is out of date with remote.** The Action will not do a `git pull` before doing the `git push`. **You** are responsible for keeping the repository up to date in your Workflow runs.
2021-08-18 18:43:30 +00:00
2022-02-27 10:18:39 +00:00
**No support for running the Action in build matrices**. If your Workflow is using build matrices, and you want that each job commits and pushes files to the remote, you will run into the issue, that the repository in the workflow will become out of date. As the Action will not do a `git pull` for you, you have to do that yourself.
2021-08-18 18:43:30 +00:00
**No support for `git rebase` or `git merge`**. There are many strategies on how to integrate remote upstream changes to a local repository. `git-auto-commit` does not want to be responsible for doing that.
2021-08-19 06:37:15 +00:00
If this Action doesn't work for your workflow, check out [EndBug/add-and-commit](https://github.com/EndBug/add-and-commit).
2021-08-18 18:43:30 +00:00
### Checkout the correct branch
2019-08-31 16:43:23 +00:00
2022-02-27 10:18:39 +00:00
You must use `action/checkout@v2` or later versions to check out the repository.
In non-`push` events, such as `pull_request`, make sure to specify the `ref` to check out:
```yaml
- uses: actions/checkout@v2
with:
ref: ${{ github.head_ref }}
```
2019-08-31 16:43:23 +00:00
2022-02-27 10:18:39 +00:00
Do this to avoid checking out the repository in a detached state.
2021-05-03 18:54:47 +00:00
### Commits made by this Action do not trigger new Workflow runs
The resulting commit **will not trigger** another GitHub Actions Workflow run.
2022-03-23 07:14:36 +00:00
This is due to [limitations set by GitHub](https://docs.github.com/en/actions/security-guides/automatic-token-authentication#using-the-github_token-in-a-workflow).
> When you use the repository's GITHUB_TOKEN to perform tasks on behalf of the GitHub Actions app, events triggered by the GITHUB_TOKEN will not create a new workflow run. This prevents you from accidentally creating recursive workflow runs.
You can change this by creating a new [Personal Access Token (PAT)](https://github.com/settings/tokens/new),
2020-07-24 18:22:18 +00:00
storing the token as a secret in your repository and then passing the new token to the [`actions/checkout`](https://github.com/actions/checkout#usage) Action step.
2020-04-24 08:14:37 +00:00
2020-01-11 20:32:11 +00:00
```yaml
- uses: actions/checkout@v2
with:
2020-07-24 18:22:18 +00:00
token: ${{ secrets.PAT }}
```
2020-01-11 20:32:11 +00:00
2022-01-24 15:51:53 +00:00
If you create a personal access token, apply the `repo` and `workflow` scopes.
2020-08-22 12:42:29 +00:00
If you work in an organization and don't want to create a PAT from your personal account, we recommend using a [robot account](https://docs.github.com/en/github/getting-started-with-github/types-of-github-accounts) for the token.
2021-08-18 18:49:52 +00:00
## Advanced Uses
2020-01-11 20:32:11 +00:00
2021-08-18 18:49:52 +00:00
<details>
<summary>Use in forks from public repositories</summary>
2020-10-17 12:14:28 +00:00
**☝️ Important Notice**: This Action technically works with forks. However, please note that the combination of triggers and their options can cause issues. Please read [the documentation](https://docs.github.com/en/free-pro-team@latest/actions/reference/events-that-trigger-workflows) on which triggers GitHub Actions support.\
If you use this Action in combination with a linter/fixer, it's easier if you run the Action on `push` on your `main`-branch.
2020-10-17 12:15:18 +00:00
---
2020-10-17 12:14:28 +00:00
By default, this Action will not run on Pull Requests which have been opened by forks. (This is a limitation by GitHub, not by us.)
However, there are a couple of ways to use this Actions in Workflows that should be triggered by forked repositories.
### Workflow should run in **base** repository
The workflow below runs whenever a commit is pushed to the `main`-branch or when activity on a pull request happens, by listening to the [`pull_request_target`](https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target) event.
If the workflow is triggered by the `pull_request_target`-event, the workflow will run in the context of the base of the pull request, rather than in the context of the merge commit, as the `pull_request` event does.
In other words, this will allow your workflow to be run in the repository where the pull request is opened to and will push changes back to the fork.
Check out the discussion in [#211](https://github.com/stefanzweifel/git-auto-commit-action/issues/211) for more information on this.
```yaml
name: Format PHP
on:
push:
branches:
- main
pull_request_target:
jobs:
php-cs-fixer:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
repository: ${{ github.event.pull_request.head.repo.full_name }}
ref: ${{ github.head_ref }}
- name: Run php-cs-fixer
uses: docker://oskarstark/php-cs-fixer-ga
- uses: stefanzweifel/git-auto-commit-action@v4
```
### Workflow should run in **forked** repository
If the workflow should run in the forked repository, follow these steps:
1. In addition to listening to the `pull_request` event in your Workflow triggers, you have to add an additional event: `pull_request_target`. You can learn more about this event in [the GitHub docs](https://docs.github.com/en/actions/reference/events-that-trigger-workflows#pull_request_target).
2. GitHub Action has to be enabled on the forked repository. \
2020-08-22 12:42:29 +00:00
For security reasons, GitHub does not automatically enable GitHub Actions on forks. The user has to explicitly enable GitHub Actions in the "Actions"-tab of the forked repository. (Mention this in your projects README or CONTRIBUTING.md!)
2020-08-22 12:42:29 +00:00
After you have added the `pull_request_target` to your desired Workflow and the forked repository has enabled Actions and a new Pull Request is opened, the Workflow will run **on the forked repository**.
Due to the fact that the Workflow is not run on the repository the Pull Request is opened in, you won't see any status indicators inside the Pull Request.
2020-08-22 12:42:29 +00:00
#### Example
The following workflow runs `php-cs-fixer` (a code linter and fixer for PHP) when a `pull_request` is opened. We've added the `pull_request_target`-trigger too, to make it work for forks.
```yaml
name: Format PHP
2020-10-17 12:14:28 +00:00
on: [push, pull_request, pull_request_target]
jobs:
php-cs-fixer:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Run php-cs-fixer
uses: docker://oskarstark/php-cs-fixer-ga
- uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: Apply php-cs-fixer changes
```
Next time a user forks your project **and** enabled GitHub Actions **and** opened a Pull Request, the Workflow will run on the the **forked** repository and will push commits to the same branch.
Here's how the Pull Request will look like:
2020-08-22 12:21:01 +00:00
![Screenshot of a Pull Request from a Fork](https://user-images.githubusercontent.com/1080923/90955964-9c74c080-e482-11ea-8097-aa7f5161f50e.png)
2021-05-03 18:54:47 +00:00
As you can see, your contributors have to go through hoops to make this work. **For Workflows which run linters and fixers (like the example above) we recommend running them when a push happens on the `main`-branch.**
For more information about running Actions on forks, see [this announcement from GitHub](https://github.blog/2020-08-03-github-actions-improvements-for-fork-and-pull-request-workflows/).
2021-08-18 18:49:52 +00:00
</details>
<details>
<summary>Push to forks from private repositories</summary>
By default, GitHub Actions doesn't run Workflows on forks from private repositories. To enable Actions for **private** repositories enable "Run workflows from pull requests" in your repository settings.
See [this announcement from GitHub](https://github.blog/2020-08-03-github-actions-improvements-for-fork-and-pull-request-workflows/) or the [GitHub docs](https://docs.github.com/en/github/administering-a-repository/disabling-or-limiting-github-actions-for-a-repository#enabling-workflows-for-private-repository-forks) for details.
2020-01-11 20:32:11 +00:00
2021-08-18 18:49:52 +00:00
</details>
<details>
<summary>
Signing Commits & Other Git Command Line Options
</summary>
2020-07-18 11:42:58 +00:00
2021-05-03 18:54:47 +00:00
Using command lines options needs to be done manually for each workflow which you require the option enabled. So for example signing commits requires you to import the gpg signature each and every time. The following list of actions are worth checking out if you need to automate these tasks regulary.
2020-07-18 11:42:58 +00:00
- [Import GPG Signature](https://github.com/crazy-max/ghaction-import-gpg) (Suggested by [TGTGamer](https://github.com/tgtgamer))
2021-08-18 18:49:52 +00:00
</details>
<details>
<summary>
Using `--amend` and `--no-edit` as commit options
</summary>
2020-02-04 18:37:00 +00:00
If you would like to use this Action to create a commit using [`--amend`](https://git-scm.com/docs/git-commit#Documentation/git-commit.txt---amend) and [`--no-edit`](https://git-scm.com/docs/git-commit#Documentation/git-commit.txt---no-edit) you need to make some adjustments.
**☝️ Important Notice:** You should understand the implications of rewriting history if you amend a commit that has already been published. [See rebasing](https://git-scm.com/docs/git-rebase#_recovering_from_upstream_rebase)
First, you need to extract the previous commit message by using `git log -1 --pretty=%s`.
Then you need to provide this last commit message to the Action through the `commit_message` input option.
Finally, you have to use `push_options: '--force'` to overwrite the git history on the GitHub remote repository. (git-auto-commit will not do a `git-rebase` for you!)
The steps in your workflow might look like this:
```yaml
- uses: actions/checkout@master
with:
2021-08-18 18:43:30 +00:00
# Fetch the last 2 commits instead of just 1. (Fetching just 1 commit would overwrite the whole history)
fetch-depth: 2
# Other steps in your workflow to trigger a changed file
- name: Get last commit message
id: last-commit-message
run: |
echo "::set-output name=msg::$(git log -1 --pretty=%s)"
- uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: ${{ steps.last-commit-message.outputs.msg }}
commit_options: '--amend --no-edit'
push_options: '--force'
skip_fetch: true
```
See discussion in [#159](https://github.com/stefanzweifel/git-auto-commit-action/issues/159#issuecomment-845347950) for details.
2021-08-18 18:49:52 +00:00
</details>
## Troubleshooting
### Action does not push commit to repository
Make sure to [checkout the correct branch](#checkout-the-correct-branch).
### Action does not push commit to repository: Authentication Issue
2020-02-23 10:42:57 +00:00
If your Workflow can't push the commit to the repository because of authentication issues,
please update your Workflow configuration and usage of [`actions/checkout`](https://github.com/actions/checkout#usage).
2020-02-23 10:42:57 +00:00
Updating the `token` value with a Personal Access Token should fix your issues.
2020-02-23 10:42:57 +00:00
### Push to protected branches
2020-05-16 11:22:34 +00:00
2021-05-03 18:54:47 +00:00
If your repository uses [protected branches](https://help.github.com/en/github/administering-a-repository/configuring-protected-branches) you have to make some changes to your Workflow for the Action to work properly: You need a Personal Access Token and you either have to allow force pushes or the Personal Acess Token needs to belong to an Administrator.
2020-05-16 11:22:34 +00:00
2021-05-03 18:54:47 +00:00
First, you have to create a new [Personal Access Token (PAT)](https://github.com/settings/tokens/new),
store the token as a secret in your repository and pass the new token to the [`actions/checkout`](https://github.com/actions/checkout#usage) Action step.
```yaml
- uses: actions/checkout@v2
with:
token: ${{ secrets.PAT }}
```
You can learn more about Personal Access Token in the [GitHub documentation](https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token).
2021-05-03 18:54:47 +00:00
**Note:** If you're working in an organisation and you don't want to create the PAT from your personal account, we recommend using a bot-account for such tokens.
If you go the "force pushes" route, you have to enable force pushes to a protected branch (See [documentation](https://help.github.com/en/github/administering-a-repository/enabling-force-pushes-to-a-protected-branch)) and update your Workflow to use force push like this.
```yaml
- uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: Apply php-cs-fixer changes
push_options: --force
```
2020-07-26 10:53:22 +00:00
### No new workflows are triggered by the commit of this action
2020-01-11 20:32:17 +00:00
This is due to limitations set up by GitHub, [commits of this Action do not trigger new Workflow runs](#commits-of-this-action-do-not-trigger-new-workflow-runs).
2020-01-11 20:32:17 +00:00
2020-09-13 12:11:23 +00:00
## Running the tests
2022-02-27 10:18:39 +00:00
The Action has tests written in [bats](https://github.com/bats-core/bats-core). Before you can run the test suite locally, you have to install the dependencies with `npm` or `yarn`.
2020-11-25 20:06:22 +00:00
```shell
npm install
yarn
```
You can run the test suite with `npm` or `yarn`.
2020-09-13 12:11:23 +00:00
```shell
2020-10-11 20:35:28 +00:00
npm run test
2020-11-25 20:06:22 +00:00
yarn test
2020-09-13 12:11:23 +00:00
```
2019-06-10 13:32:16 +00:00
## Versioning
We use [SemVer](http://semver.org/) for versioning. For the versions available, see the [tags on this repository](https://github.com/stefanzweifel/git-auto-commit-action/tags).
2020-05-16 11:47:17 +00:00
We also provide major version tags to make it easier to always use the latest release of a major version. For example you can use `stefanzweifel/git-auto-commit-action@v4` to always use the latest release of the current major version.
(More information about this [here](https://help.github.com/en/actions/building-actions/about-actions#versioning-your-action).)
2020-05-16 11:47:17 +00:00
2021-05-03 18:23:02 +00:00
## Credits
* [Stefan Zweifel](https://github.com/stefanzweifel)
* [All Contributors](https://github.com/stefanzweifel/git-auto-commit-action/graphs/contributors)
2021-05-03 18:54:47 +00:00
This Action has been inspired and adapted from the [auto-commit](https://github.com/cds-snc/github-actions/tree/master/auto-commit
)-Action of the Canadian Digital Service and this [commit](https://github.com/elstudio/actions-js-build/blob/41d604d6e73d632e22eac40df8cc69b5added04b/commit/entrypoint.sh)-Action by Eric Johnson.
2019-06-10 13:32:16 +00:00
## License
This project is licensed under the MIT License - see the [LICENSE](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/LICENSE) file for details.