From fdbf83651948dc8b8aac29cc548dd3fdf97d24a9 Mon Sep 17 00:00:00 2001 From: Stefan Zweifel Date: Wed, 22 Apr 2020 20:07:31 +0200 Subject: [PATCH 01/10] Split git-commit command --- entrypoint.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 5c46e02..329745b 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -50,7 +50,13 @@ _add_files() { _local_commit() { echo "INPUT_COMMIT_OPTIONS: ${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"} + + if [ -n "$INPUT_COMMIT_OPTIONS" ] + then + 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" + else + git -c user.name="$INPUT_COMMIT_USER_NAME" -c user.email="$INPUT_COMMIT_USER_EMAIL" commit -m "$INPUT_COMMIT_MESSAGE" --author="$INPUT_COMMIT_AUTHOR" + fi } _tag_commit() { From e8ab63a01ba9336af46b3009566b7368e605ebe9 Mon Sep 17 00:00:00 2001 From: Stefan Zweifel Date: Wed, 22 Apr 2020 20:17:05 +0200 Subject: [PATCH 02/10] Add ; in more places --- entrypoint.sh | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 329745b..e03d3f5 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -7,7 +7,7 @@ _main() { if _git_is_dirty; then - echo "::set-output name=changes_detected::true" + echo "::set-output name=changes_detected::true"; _switch_to_branch @@ -20,16 +20,16 @@ _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() { @@ -40,22 +40,22 @@ _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}" - git add "${INPUT_FILE_PATTERN}" + echo "INPUT_FILE_PATTERN: ${INPUT_FILE_PATTERN}"; + git add "${INPUT_FILE_PATTERN}"; } _local_commit() { - echo "INPUT_COMMIT_OPTIONS: ${INPUT_COMMIT_OPTIONS}" + echo "INPUT_COMMIT_OPTIONS: ${INPUT_COMMIT_OPTIONS}"; if [ -n "$INPUT_COMMIT_OPTIONS" ] then - 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" + 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"; else - git -c user.name="$INPUT_COMMIT_USER_NAME" -c user.email="$INPUT_COMMIT_USER_EMAIL" commit -m "$INPUT_COMMIT_MESSAGE" --author="$INPUT_COMMIT_AUTHOR" + git -c user.name="$INPUT_COMMIT_USER_NAME" -c user.email="$INPUT_COMMIT_USER_EMAIL" commit -m "$INPUT_COMMIT_MESSAGE" --author="$INPUT_COMMIT_AUTHOR"; fi } @@ -64,10 +64,10 @@ _tag_commit() { if [ -n "$INPUT_TAGGING_MESSAGE" ] then - echo "::debug::Create tag $INPUT_TAGGING_MESSAGE" - git tag -a "$INPUT_TAGGING_MESSAGE" -m "$INPUT_TAGGING_MESSAGE" + echo "::debug::Create tag $INPUT_TAGGING_MESSAGE"; + git 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 } @@ -77,16 +77,16 @@ _push_to_github() { # Only add `--tags` option, if `$INPUT_TAGGING_MESSAGE` is set if [ -n "$INPUT_TAGGING_MESSAGE" ] then - echo "::debug::git push origin --tags" - git push origin --tags + echo "::debug::git push origin --tags"; + git push origin --tags; else - echo "::debug::git push origin" - git push origin + echo "::debug::git push origin"; + git push origin; fi else - echo "::debug::Push commit to remote branch $INPUT_BRANCH" - 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 } From fbbf9665a841e150e2f8e151835182d76ba9de24 Mon Sep 17 00:00:00 2001 From: Stefan Zweifel Date: Wed, 22 Apr 2020 20:21:08 +0200 Subject: [PATCH 03/10] Output git version and debugging message --- entrypoint.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/entrypoint.sh b/entrypoint.sh index e03d3f5..ac7bcbe 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -51,8 +51,11 @@ _add_files() { _local_commit() { echo "INPUT_COMMIT_OPTIONS: ${INPUT_COMMIT_OPTIONS}"; + git --version; + if [ -n "$INPUT_COMMIT_OPTIONS" ] then + echo "::debug::Apply commit options $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"; else git -c user.name="$INPUT_COMMIT_USER_NAME" -c user.email="$INPUT_COMMIT_USER_EMAIL" commit -m "$INPUT_COMMIT_MESSAGE" --author="$INPUT_COMMIT_AUTHOR"; From 5dae7dbdb71118c69d1c040332f2f176825c2f57 Mon Sep 17 00:00:00 2001 From: Stefan Zweifel Date: Wed, 22 Apr 2020 20:36:26 +0200 Subject: [PATCH 04/10] Hard Code Options --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index ac7bcbe..726fb23 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -56,7 +56,7 @@ _local_commit() { if [ -n "$INPUT_COMMIT_OPTIONS" ] then echo "::debug::Apply commit options $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"; + git -c user.name="$INPUT_COMMIT_USER_NAME" -c user.email="$INPUT_COMMIT_USER_EMAIL" commit -m "$INPUT_COMMIT_MESSAGE" --author="$INPUT_COMMIT_AUTHOR" --signoff --no-verify; else git -c user.name="$INPUT_COMMIT_USER_NAME" -c user.email="$INPUT_COMMIT_USER_EMAIL" commit -m "$INPUT_COMMIT_MESSAGE" --author="$INPUT_COMMIT_AUTHOR"; fi From 1f6bf5e4c0a1bd5d77ed6864a3efea93d992c780 Mon Sep 17 00:00:00 2001 From: Stefan Zweifel Date: Wed, 22 Apr 2020 20:39:08 +0200 Subject: [PATCH 05/10] Set default value for commit_options --- action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/action.yml b/action.yml index 2ca3947..ab0ed98 100644 --- a/action.yml +++ b/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 From f278d451d87a4bec9189f312c7d128bb96bd94cc Mon Sep 17 00:00:00 2001 From: Stefan Zweifel Date: Wed, 22 Apr 2020 20:39:17 +0200 Subject: [PATCH 06/10] Revert hard coded options --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 726fb23..ac7bcbe 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -56,7 +56,7 @@ _local_commit() { if [ -n "$INPUT_COMMIT_OPTIONS" ] then echo "::debug::Apply commit options $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" --signoff --no-verify; + 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"; else git -c user.name="$INPUT_COMMIT_USER_NAME" -c user.email="$INPUT_COMMIT_USER_EMAIL" commit -m "$INPUT_COMMIT_MESSAGE" --author="$INPUT_COMMIT_AUTHOR"; fi From 1ba0b8765f73ebf0487e833c4b618d5b3369da95 Mon Sep 17 00:00:00 2001 From: Stefan Zweifel Date: Wed, 22 Apr 2020 20:43:52 +0200 Subject: [PATCH 07/10] WIP --- entrypoint.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index ac7bcbe..9589ca1 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -55,8 +55,8 @@ _local_commit() { if [ -n "$INPUT_COMMIT_OPTIONS" ] then - echo "::debug::Apply commit options $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"; + echo "::debug::Apply commit options ${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}"; else git -c user.name="$INPUT_COMMIT_USER_NAME" -c user.email="$INPUT_COMMIT_USER_EMAIL" commit -m "$INPUT_COMMIT_MESSAGE" --author="$INPUT_COMMIT_AUTHOR"; fi From 2dec151b5c077931e4e1d330adb21a626e048e89 Mon Sep 17 00:00:00 2001 From: Stefan Zweifel Date: Wed, 22 Apr 2020 20:49:36 +0200 Subject: [PATCH 08/10] WIP --- entrypoint.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 9589ca1..848f9a6 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -56,7 +56,10 @@ _local_commit() { if [ -n "$INPUT_COMMIT_OPTIONS" ] then echo "::debug::Apply commit options ${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}"; + + git -c user.name="$INPUT_COMMIT_USER_NAME" -c user.email="$INPUT_COMMIT_USER_EMAIL" commit -m "Message" "${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}"; else git -c user.name="$INPUT_COMMIT_USER_NAME" -c user.email="$INPUT_COMMIT_USER_EMAIL" commit -m "$INPUT_COMMIT_MESSAGE" --author="$INPUT_COMMIT_AUTHOR"; fi From 88ddd5fba5a6492a19b30d76b43b8a9c26dff157 Mon Sep 17 00:00:00 2001 From: Stefan Zweifel Date: Wed, 22 Apr 2020 21:04:17 +0200 Subject: [PATCH 09/10] WIP --- entrypoint.sh | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 848f9a6..6be3a2e 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -50,19 +50,12 @@ _add_files() { _local_commit() { echo "INPUT_COMMIT_OPTIONS: ${INPUT_COMMIT_OPTIONS}"; + echo "::debug::Apply commit options ${INPUT_COMMIT_OPTIONS}"; - git --version; - - if [ -n "$INPUT_COMMIT_OPTIONS" ] - then - echo "::debug::Apply commit options ${INPUT_COMMIT_OPTIONS}"; - - git -c user.name="$INPUT_COMMIT_USER_NAME" -c user.email="$INPUT_COMMIT_USER_EMAIL" commit -m "Message" "${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}"; - else - git -c user.name="$INPUT_COMMIT_USER_NAME" -c user.email="$INPUT_COMMIT_USER_EMAIL" commit -m "$INPUT_COMMIT_MESSAGE" --author="$INPUT_COMMIT_AUTHOR"; - fi + 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"}; } _tag_commit() { From 6e0a745133f727a7f2f76bd7941cc6ba89281cc9 Mon Sep 17 00:00:00 2001 From: Stefan Zweifel Date: Wed, 22 Apr 2020 21:17:10 +0200 Subject: [PATCH 10/10] Use Array --- entrypoint.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 6be3a2e..6c7f954 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -52,10 +52,12 @@ _local_commit() { echo "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"}; + ${INPUT_COMMIT_OPTIONS:+"${INPUT_COMMIT_OPTIONS_ARRAY[@]}"}; } _tag_commit() {