Merge pull request #64 from stefanzweifel/fix-61
Fix Issue with Commit Options
This commit is contained in:
commit
43ed630979
@ -14,6 +14,7 @@ inputs:
|
|||||||
commit_options:
|
commit_options:
|
||||||
description: Commit options (eg. --no-verify)
|
description: Commit options (eg. --no-verify)
|
||||||
required: false
|
required: false
|
||||||
|
default: ''
|
||||||
file_pattern:
|
file_pattern:
|
||||||
description: File pattern used for `git add`. For example `src/\*.js`
|
description: File pattern used for `git add`. For example `src/\*.js`
|
||||||
required: false
|
required: false
|
||||||
|
@ -7,7 +7,7 @@ _main() {
|
|||||||
|
|
||||||
if _git_is_dirty; then
|
if _git_is_dirty; then
|
||||||
|
|
||||||
echo "::set-output name=changes_detected::true"
|
echo "::set-output name=changes_detected::true";
|
||||||
|
|
||||||
_switch_to_branch
|
_switch_to_branch
|
||||||
|
|
||||||
@ -20,16 +20,16 @@ _main() {
|
|||||||
_push_to_github
|
_push_to_github
|
||||||
else
|
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
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
_switch_to_repository() {
|
_switch_to_repository() {
|
||||||
echo "INPUT_REPOSITORY value: $INPUT_REPOSITORY";
|
echo "INPUT_REPOSITORY value: $INPUT_REPOSITORY";
|
||||||
cd $INPUT_REPOSITORY
|
cd $INPUT_REPOSITORY;
|
||||||
}
|
}
|
||||||
|
|
||||||
_git_is_dirty() {
|
_git_is_dirty() {
|
||||||
@ -40,17 +40,24 @@ _switch_to_branch() {
|
|||||||
echo "INPUT_BRANCH value: $INPUT_BRANCH";
|
echo "INPUT_BRANCH value: $INPUT_BRANCH";
|
||||||
|
|
||||||
# Switch to branch from current Workflow run
|
# Switch to branch from current Workflow run
|
||||||
git checkout $INPUT_BRANCH
|
git checkout $INPUT_BRANCH;
|
||||||
}
|
}
|
||||||
|
|
||||||
_add_files() {
|
_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() {
|
_local_commit() {
|
||||||
echo "INPUT_COMMIT_OPTIONS: ${INPUT_COMMIT_OPTIONS}"
|
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 "::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() {
|
_tag_commit() {
|
||||||
@ -58,10 +65,10 @@ _tag_commit() {
|
|||||||
|
|
||||||
if [ -n "$INPUT_TAGGING_MESSAGE" ]
|
if [ -n "$INPUT_TAGGING_MESSAGE" ]
|
||||||
then
|
then
|
||||||
echo "::debug::Create tag $INPUT_TAGGING_MESSAGE"
|
echo "::debug::Create tag $INPUT_TAGGING_MESSAGE";
|
||||||
git tag -a "$INPUT_TAGGING_MESSAGE" -m "$INPUT_TAGGING_MESSAGE"
|
git tag -a "$INPUT_TAGGING_MESSAGE" -m "$INPUT_TAGGING_MESSAGE";
|
||||||
else
|
else
|
||||||
echo " No tagging message supplied. No tag will be added."
|
echo " No tagging message supplied. No tag will be added.";
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -71,16 +78,16 @@ _push_to_github() {
|
|||||||
# Only add `--tags` option, if `$INPUT_TAGGING_MESSAGE` is set
|
# Only add `--tags` option, if `$INPUT_TAGGING_MESSAGE` is set
|
||||||
if [ -n "$INPUT_TAGGING_MESSAGE" ]
|
if [ -n "$INPUT_TAGGING_MESSAGE" ]
|
||||||
then
|
then
|
||||||
echo "::debug::git push origin --tags"
|
echo "::debug::git push origin --tags";
|
||||||
git push origin --tags
|
git push origin --tags;
|
||||||
else
|
else
|
||||||
echo "::debug::git push origin"
|
echo "::debug::git push origin";
|
||||||
git push origin
|
git push origin;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
else
|
else
|
||||||
echo "::debug::Push commit to remote branch $INPUT_BRANCH"
|
echo "::debug::Push commit to remote branch $INPUT_BRANCH";
|
||||||
git push --set-upstream origin "HEAD:$INPUT_BRANCH" --tags
|
git push --set-upstream origin "HEAD:$INPUT_BRANCH" --tags;
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user