suyiiyii/git-auto-commit-action
1
0
Fork 0
mirror of https://github.com/stefanzweifel/git-auto-commit-action.git synced 2024-11-06 02:08:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #64 from stefanzweifel/fix-61

Browse Source 
Fix Issue with Commit Options
This commit is contained in:
Stefan Zweifel 2020-04-23 20:35:56 +02:00 committed by GitHub
commit 43ed630979
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
action.yml
View File

@ -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

43
entrypoint.sh
View File

@ -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,17 +40,24 @@ _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}"
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"}
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_ARRAY[@]}"};
}
_tag_commit() {
@ -58,10 +65,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
}
@ -71,16 +78,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
}