Release v4.1.6

Inline User Configuration when creating a Tag

CHANGELOG.md

@@ -4,7 +4,36 @@ 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.2...HEAD)
+## [Unreleased](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4.1.6...HEAD)
+
+> TBD
+
+## [v4.1.6](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4.1.5...v4.1.6) - 2020-04-28
+
+### Fixes
+- Fix issue where tags could not be created correctly [#68](https://github.com/stefanzweifel/git-auto-commit-action/pull/68)
+
+## [v4.1.5](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4.1.4...v4.1.5) - 2020-04-23
+
+### Added
+- Update `file_pattern` to support multiple file paths [#65](https://github.com/stefanzweifel/git-auto-commit-action/pull/65)
+
+### Changes
+- Revert changes made in v4.1.4 [#63](https://github.com/stefanzweifel/git-auto-commit-action/pull/63)
+
+### Fixes
+- Fix issue with `commit_options` [#64](https://github.com/stefanzweifel/git-auto-commit-action/pull/64)
+
+## [v4.1.4](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4.1.3...v4.1.4) - 2020-04-22
+
+### Fixed
+- Fix bug introduced in previous version, where git user configuration has been placed inline [#62](https://github.com/stefanzweifel/git-auto-commit-action/pull/62)
+
+
+## [v4.1.3](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4.1.2...v4.1.3) - 2020-04-18
+
+### Changed
+- Place Git user configuration inline [#59](https://github.com/stefanzweifel/git-auto-commit-action/pull/59)
 
 ## [v4.1.2](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4.1.1...v4.1.2) - 2020-04-03
 

README.md

@@ -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.2
+- uses: stefanzweifel/git-auto-commit-action@v4.1.6
   with:
     commit_message: Apply automatic changes
 
@@ -29,7 +29,7 @@ Add the following step at the end of your job.
     commit_options: '--no-verify --signoff'
 
     # Optional glob pattern of files which should be added to the commit
-    file_pattern: src/\*.js
+    file_pattern: src/*.js tests/*.js
 
     # Optional local file path to the repository
     repository: .
@@ -57,6 +57,8 @@ In this example I'm running `php-cs-fixer` in a PHP project.
 
 ### Example on `pull_request` event
 
+If you would like to use this Action in a Workflow which listens to the `pull_request` event, you must add the `ref`-input to the `actions/checkout@v2` step. It's also recommended to add the `branch`-input to the `git-auto-commit`-step. This way you tell the Action exactly where to push the commit.
+
 ```yaml
 name: php-cs-fixer
 
@@ -74,7 +76,7 @@ jobs:
     - name: Run php-cs-fixer
       uses: docker://oskarstark/php-cs-fixer-ga
 
-    - uses: stefanzweifel/git-auto-commit-action@v4.1.2
+    - uses: stefanzweifel/git-auto-commit-action@v4.1.6
       with:
         commit_message: Apply php-cs-fixer changes
         branch: ${{ github.head_ref }}
@@ -97,7 +99,7 @@ jobs:
     - name: Run php-cs-fixer
       uses: docker://oskarstark/php-cs-fixer-ga
 
-    - uses: stefanzweifel/git-auto-commit-action@v4.1.2
+    - uses: stefanzweifel/git-auto-commit-action@v4.1.6
       with:
         commit_message: Apply php-cs-fixer changes
 ```
@@ -145,7 +147,7 @@ jobs:
     - name: Run php-cs-fixer
       uses: docker://oskarstark/php-cs-fixer-ga
 
-    - uses: stefanzweifel/git-auto-commit-action@v4.1.2
+    - uses: stefanzweifel/git-auto-commit-action@v4.1.6
       with:
         commit_message: Apply php-cs-fixer changes
 ```

action.yml

@@ -14,6 +14,7 @@ inputs:
   commit_options:
     description: Commit options (eg. --no-verify)
     required: false
+    default: ''
   file_pattern:
     description: File pattern used for `git add`. For example `src/\*.js`
     required: false

entrypoint.sh

@@ -7,9 +7,7 @@ _main() {
 
     if _git_is_dirty; then
 
-        echo "::set-output name=changes_detected::true"
+        echo "::set-output name=changes_detected::true";
-
-        _setup_git
 
         _switch_to_branch
 
@@ -22,43 +20,44 @@ _main() {
         _push_to_github
     else
 
-        echo "::set-output name=changes_detected::false"
+        echo "::set-output name=changes_detected::false";
 
-        echo "Working tree clean. Nothing to commit."
+        echo "Working tree clean. Nothing to commit.";
     fi
 }
 
 
 _switch_to_repository() {
     echo "INPUT_REPOSITORY value: $INPUT_REPOSITORY";
-    cd $INPUT_REPOSITORY
+    cd $INPUT_REPOSITORY;
 }
 
 _git_is_dirty() {
     [ -n "$(git status -s)" ]
 }
 
-# Set up git user configuration
-_setup_git ( ) {
-    git config --global user.name "$INPUT_COMMIT_USER_NAME"
-    git config --global user.email "$INPUT_COMMIT_USER_EMAIL"
-}
-
 _switch_to_branch() {
     echo "INPUT_BRANCH value: $INPUT_BRANCH";
 
     # Switch to branch from current Workflow run
-    git checkout $INPUT_BRANCH
+    git checkout $INPUT_BRANCH;
 }
 
 _add_files() {
-    echo "INPUT_FILE_PATTERN: ${INPUT_FILE_PATTERN}"
+    echo "INPUT_FILE_PATTERN: ${INPUT_FILE_PATTERN}";
-    git add "${INPUT_FILE_PATTERN}"
+    git add ${INPUT_FILE_PATTERN};
 }
 
 _local_commit() {
-    echo "INPUT_COMMIT_OPTIONS: ${INPUT_COMMIT_OPTIONS}"
+    echo "INPUT_COMMIT_OPTIONS: ${INPUT_COMMIT_OPTIONS}";
-    git commit -m "$INPUT_COMMIT_MESSAGE" --author="$INPUT_COMMIT_AUTHOR" ${INPUT_COMMIT_OPTIONS:+"$INPUT_COMMIT_OPTIONS"}
+    echo "::debug::Apply commit options ${INPUT_COMMIT_OPTIONS}";
+
+    INPUT_COMMIT_OPTIONS_ARRAY=( $INPUT_COMMIT_OPTIONS );
+
+    git -c user.name="$INPUT_COMMIT_USER_NAME" -c user.email="$INPUT_COMMIT_USER_EMAIL" \
+        commit -m "$INPUT_COMMIT_MESSAGE" \
+        --author="$INPUT_COMMIT_AUTHOR" \
+        ${INPUT_COMMIT_OPTIONS:+"${INPUT_COMMIT_OPTIONS_ARRAY[@]}"};
 }
 
 _tag_commit() {
@@ -66,9 +65,10 @@ _tag_commit() {
 
     if [ -n "$INPUT_TAGGING_MESSAGE" ]
     then
-        git tag -a "$INPUT_TAGGING_MESSAGE" -m "$INPUT_TAGGING_MESSAGE"
+        echo "::debug::Create tag $INPUT_TAGGING_MESSAGE";
+        git -c user.name="$INPUT_COMMIT_USER_NAME" -c user.email="$INPUT_COMMIT_USER_EMAIL" tag -a "$INPUT_TAGGING_MESSAGE" -m "$INPUT_TAGGING_MESSAGE";
     else
-        echo " No tagging message supplied. No tag will be added."
+        echo " No tagging message supplied. No tag will be added.";
     fi
 }
 
@@ -78,13 +78,16 @@ _push_to_github() {
         # Only add `--tags` option, if `$INPUT_TAGGING_MESSAGE` is set
         if [ -n "$INPUT_TAGGING_MESSAGE" ]
         then
-             git push origin --tags
+            echo "::debug::git push origin --tags";
+            git push origin --tags;
         else
-             git push origin
+            echo "::debug::git push origin";
+            git push origin;
         fi
 
     else
-        git push --set-upstream origin "HEAD:$INPUT_BRANCH" --tags
+        echo "::debug::Push commit to remote branch $INPUT_BRANCH";
+        git push --set-upstream origin "HEAD:$INPUT_BRANCH" --tags;
     fi
 }