Compare commits

...

36 Commits

Author SHA1 Message Date
Stefan Zweifel
dd055f6225 Release v4.1.2 2020-04-03 09:19:39 +02:00
Stefan Zweifel
55734408b7 Merge pull request #57 from wxt2005/master
Remove unnecessary escape
2020-04-03 09:10:34 +02:00
Botao
d317154f77 Remove unnecessary escape 2020-04-03 13:21:53 +08:00
Stefan Zweifel
36489f4cb5 Merge pull request #56 from localheinz/patch-1
Fix: Typo
2020-03-17 15:44:10 +01:00
Andreas Möller
2530046e72 Fix: Typo 2020-03-17 13:44:47 +01:00
Stefan Zweifel
172c2a2fc3 Update CD Workflow 2020-03-14 13:39:33 +01:00
Stefan Zweifel
480e111bf8 Release v4.1.1 2020-03-14 13:37:49 +01:00
Stefan Zweifel
7659782c71 Merge pull request #54 from stefanzweifel/hotfix/optional-branch-push
Fix: Push branch to repository if no branch name is given and no tagging message is set
2020-03-14 13:34:39 +01:00
Stefan Zweifel
026f88c27c Fix typo in message 2020-03-14 13:32:10 +01:00
Stefan Zweifel
f73d11d461 Revert changes 2020-03-14 13:21:42 +01:00
Stefan Zweifel
2b6b90e8f1 Test shorthand 2020-03-14 13:20:32 +01:00
Stefan Zweifel
e1770ec52b Only add --tags option if tagging message is set 2020-03-14 13:13:34 +01:00
Stefan Zweifel
0453bb1c25 Temp disable push of tags 2020-03-14 13:11:13 +01:00
Stefan Zweifel
da55e4a0cf Add echo statements for easier debugging 2020-03-14 13:09:53 +01:00
Stefan Zweifel
b1833bd054 Merge pull request #52 from localheinz/fix/typo
Fix: Typo
2020-03-13 17:02:58 +01:00
Andreas Möller
6dfda22dd6 Fix: Typo 2020-03-13 12:35:11 +01:00
Stefan Zweifel
94c72aa7c5 Update Changelog and Readme for v4.1.0 2020-03-05 20:55:10 +01:00
Stefan Zweifel
87526a8aa1 Merge pull request #50 from stefanzweifel/feature/tag-commit
Feature: Tag commit created by the Action
2020-03-05 20:52:29 +01:00
Stefan Zweifel
844c808726 Echo out the tagging message 2020-03-05 20:48:15 +01:00
Stefan Zweifel
ce08dda6b3 Update Wording 2020-03-05 20:48:00 +01:00
Stefan Zweifel
0ad4c8ce73 Fix _tag_commit 2020-03-05 20:35:32 +01:00
Stefan Zweifel
3387b2f267 Add tagging_message input option 2020-03-05 20:31:06 +01:00
Stefan Zweifel
d4a53f1779 Push Tags to Remote Repository 2020-03-05 20:28:38 +01:00
Stefan Zweifel
956a47433b Merge pull request #49 from stefanzweifel/feature/outputs
Feature: Add "changes_detected" output
2020-03-04 20:44:32 +01:00
Stefan Zweifel
f866b2a854 Update Changelog 2020-03-04 20:33:53 +01:00
Stefan Zweifel
8744cc88ef Update README 2020-03-04 20:33:10 +01:00
Stefan Zweifel
57bbd38e56 Add outputs to action.yml 2020-03-04 19:56:33 +01:00
Stefan Zweifel
eef5f33ea3 WIP 2020-03-03 21:04:57 +01:00
Stefan Zweifel
25e6f0b17d Echo changes_detected in workflow 2020-03-03 21:00:40 +01:00
Stefan Zweifel
ae885f5d8c WIP 2020-03-03 20:54:12 +01:00
Stefan Zweifel
33e8fd937f Add changes_detected output 2020-03-03 20:51:12 +01:00
Stefan Zweifel
404d2015f4 Add Workflow to run git-auto-commit 2020-03-03 20:51:02 +01:00
Stefan Zweifel
cd0530ad7a Merge pull request #48 from clxmstaab/patch-1
example: fix typo
2020-03-03 12:12:50 +01:00
Markus Staab
2a957f5c41 example: fix typo 2020-03-03 12:08:03 +01:00
Stefan Zweifel
7e64e614a1 Fix Typo in README 2020-02-29 09:52:12 +01:00
Stefan Zweifel
c887fa4a07 Update Changelog 2020-02-24 20:09:19 +01:00
6 changed files with 96 additions and 14 deletions

View File

@@ -25,5 +25,7 @@ jobs:
with:
draft: false
prerelease: false
body: |
See [Changelog](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/CHANGELOG.md) for details.
release_name: "${{ steps.determine-tag.outputs.tag }}"
tag_name: "${{ steps.determine-tag.outputs.tag }}"

22
.github/workflows/git-auto-commit.yml vendored Normal file
View File

@@ -0,0 +1,22 @@
name: git-auto-commit
on: push
jobs:
git-auto-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Use git-auto-commit-action
id: "auto-commit-action"
uses: ./
- name: "no changes detected"
if: steps.auto-commit-action.outputs.changes_detected == false
run: "echo \"No changes detected\""
- name: "changes detected"
if: steps.auto-commit-action.outputs.changes_detected == true
run: "echo \"Changes detected\""

View File

@@ -4,14 +4,30 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
## [Unreleased](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4.0.0...HEAD)
## [Unreleased](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4.1.2...HEAD)
## [v4.1.2](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4.1.1...v4.1.2) - 2020-04-03
### Fixes
- Fix Issue with `changes_detected`-output [#57](https://github.com/stefanzweifel/git-auto-commit-action/pull/57)
## [v4.1.1](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4.1.0...v4.1.1) - 2020-03-14
### Fixes
- Fix issue where commit has not been pushed to remote repository, when no `branch`-option has been given [#54](https://github.com/stefanzweifel/git-auto-commit-action/pull/54)
## [v4.1.0](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4.0.0...v4.1.0) - 2020-03-05
### Added
- Add `changes_detected` output [#49](https://github.com/stefanzweifel/git-auto-commit-action/pull/49), [#46](https://github.com/stefanzweifel/git-auto-commit-action/issues/46)
- Add `tagging_message` input option to create and push tags [#50](https://github.com/stefanzweifel/git-auto-commit-action/pull/50), [#47](https://github.com/stefanzweifel/git-auto-commit-action/issues/47)
> TBD
## [v4.0.0](https://github.com/stefanzweifel/git-auto-commit-action/compare/v3.0.0...v4.0.0) - 2020-02-24
### Changed
- Switch Action to use `node12`-environment instead of `docker`.
- Switch Action to use `node12`-environment instead of `docker`. [#45](https://github.com/stefanzweifel/git-auto-commit-action/pull/45)
## [v3.0.0](https://github.com/stefanzweifel/git-auto-commit-action/compare/v2.5.0...v3.0.0) - 2020-02-06

View File

@@ -17,7 +17,7 @@ This Action has been inspired and adapted from the [auto-commit](https://github.
Add the following step at the end of your job.
```yaml
- uses: stefanzweifel/git-auto-commit-action@v4.0.0
- uses: stefanzweifel/git-auto-commit-action@v4.1.2
with:
commit_message: Apply automatic changes
@@ -37,13 +37,16 @@ Add the following step at the end of your job.
# Optional commit user and author settings
commit_user_name: My GitHub Actions Bot
commit_user_email: my-github-actions-bot@example.org
commit_author: Author <actions@gitub.com>
commit_author: Author <actions@github.com>
# Optional tag message. Will create and push a new tag to the remote repository
tagging_message: 'v1.0.0'
```
The Action will only commit files back, if changes are available. The resulting commit **will not trigger** another GitHub Actions Workflow run!
We recommend to use this Action in Workflows, which listen to the `pull_request` event. You can then use the option `branch: ${{ github.head_ref }}` to set up the branch name correctly.
If you don't pass a branch name, the Action will try to push the commit to a branch with the same name, as with wich the repo has been checked out.
If you don't pass a branch name, the Action will try to push the commit to a branch with the same name, as with which the repo has been checked out.
## Example Usage
@@ -71,7 +74,7 @@ jobs:
- name: Run php-cs-fixer
uses: docker://oskarstark/php-cs-fixer-ga
- uses: stefanzweifel/git-auto-commit-action@v4.0.0
- uses: stefanzweifel/git-auto-commit-action@v4.1.2
with:
commit_message: Apply php-cs-fixer changes
branch: ${{ github.head_ref }}
@@ -94,7 +97,7 @@ jobs:
- name: Run php-cs-fixer
uses: docker://oskarstark/php-cs-fixer-ga
- uses: stefanzweifel/git-auto-commit-action@v4.0.0
- uses: stefanzweifel/git-auto-commit-action@v4.1.2
with:
commit_message: Apply php-cs-fixer changes
```
@@ -103,20 +106,25 @@ jobs:
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.
## Troubleshooting
### Can't push commit to repository
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). (Updating the `token` value with a Personal Access Token should fix your issues)
### Commit of this Action does not trigger a new Workflow run
As mentioned in the [Usage](#Usage) section, the commit created by this Action **will not trigger** a new Workflow run automatically.
As mentioned in the [Usage](#Usage) section, the commit created by this Action **will not trigger** a new Workflow run automatically.
This is due to limitations set up by GitHub:
> An action in a workflow run can't trigger a new workflow run. For example, if an action pushes code using the repository's GITHUB_TOKEN, a new workflow will not run even when the repository contains a workflow configured to run when push events occur.
[Source](https://help.github.com/en/actions/reference/events-that-trigger-workflows)
You can change this by creating a new [Pesonal Access Token (PAT)](https://github.com/settings/tokens/new), 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.
You can change this by creating a new [Personal Access Token (PAT)](https://github.com/settings/tokens/new), 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.
#### Example Workflow
@@ -131,12 +139,13 @@ jobs:
steps:
- uses: actions/checkout@v2
token: ${{ secrets.PAT_TOKEN }}
with:
token: ${{ secrets.PAT_TOKEN }}
- name: Run php-cs-fixer
uses: docker://oskarstark/php-cs-fixer-ga
- uses: stefanzweifel/git-auto-commit-action@v4.0.0
- uses: stefanzweifel/git-auto-commit-action@v4.1.2
with:
commit_message: Apply php-cs-fixer changes
```

View File

@@ -34,6 +34,14 @@ inputs:
description: Value used for the commit author. Defaults to the username of whoever triggered this workflow run.
required: false
default: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
tagging_message:
description: Message used to create a new git tag with the commit. Keep this empty, if no tag should be created.
required: false
default: ''
outputs:
changes_detected:
description: Value is "true", if the repository was dirty and file changes have been detected. Value is "false", if no changes have been detected.
runs:
using: 'node12'

View File

@@ -7,6 +7,8 @@ _main() {
if _git_is_dirty; then
echo "::set-output name=changes_detected::true"
_setup_git
_switch_to_branch
@@ -15,8 +17,13 @@ _main() {
_local_commit
_tag_commit
_push_to_github
else
echo "::set-output name=changes_detected::false"
echo "Working tree clean. Nothing to commit."
fi
}
@@ -54,12 +61,30 @@ _local_commit() {
git commit -m "$INPUT_COMMIT_MESSAGE" --author="$INPUT_COMMIT_AUTHOR" ${INPUT_COMMIT_OPTIONS:+"$INPUT_COMMIT_OPTIONS"}
}
_tag_commit() {
echo "INPUT_TAGGING_MESSAGE: ${INPUT_TAGGING_MESSAGE}"
if [ -n "$INPUT_TAGGING_MESSAGE" ]
then
git tag -a "$INPUT_TAGGING_MESSAGE" -m "$INPUT_TAGGING_MESSAGE"
else
echo " No tagging message supplied. No tag will be added."
fi
}
_push_to_github() {
if [ -z "$INPUT_BRANCH" ]
then
git push origin
# Only add `--tags` option, if `$INPUT_TAGGING_MESSAGE` is set
if [ -n "$INPUT_TAGGING_MESSAGE" ]
then
git push origin --tags
else
git push origin
fi
else
git push --set-upstream origin "HEAD:$INPUT_BRANCH"
git push --set-upstream origin "HEAD:$INPUT_BRANCH" --tags
fi
}