Compare commits

..

10 Commits

Author SHA1 Message Date
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
3 changed files with 21 additions and 9 deletions

View File

@@ -4,9 +4,12 @@ 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.1.0...HEAD)
## [Unreleased](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4.1.1...HEAD)
> TBD
## [v4.1.1](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4.1.1...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

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.1.0
- uses: stefanzweifel/git-auto-commit-action@v4.1.1
with:
commit_message: Apply automatic changes
@@ -37,7 +37,7 @@ 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'
@@ -74,7 +74,7 @@ jobs:
- name: Run php-cs-fixer
uses: docker://oskarstark/php-cs-fixer-ga
- uses: stefanzweifel/git-auto-commit-action@v4.1.0
- uses: stefanzweifel/git-auto-commit-action@v4.1.1
with:
commit_message: Apply php-cs-fixer changes
branch: ${{ github.head_ref }}
@@ -97,7 +97,7 @@ jobs:
- name: Run php-cs-fixer
uses: docker://oskarstark/php-cs-fixer-ga
- uses: stefanzweifel/git-auto-commit-action@v4.1.0
- uses: stefanzweifel/git-auto-commit-action@v4.1.1
with:
commit_message: Apply php-cs-fixer changes
```
@@ -145,7 +145,7 @@ jobs:
- name: Run php-cs-fixer
uses: docker://oskarstark/php-cs-fixer-ga
- uses: stefanzweifel/git-auto-commit-action@v4.1.0
- uses: stefanzweifel/git-auto-commit-action@v4.1.1
with:
commit_message: Apply php-cs-fixer changes
```

View File

@@ -67,13 +67,22 @@ _tag_commit() {
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 --tags
# 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" --tags
fi