mirror of
https://github.com/creyD/prettier_action.git
synced 2026-04-17 05:40:31 +02:00
fix: changes the logic to handle dry-run with --write option and corrects the logic as it will never have changes on dry-run
This commit is contained in:
@@ -25,6 +25,10 @@ _git_changed() {
|
|||||||
[[ -n "$(git status -s)" ]]
|
[[ -n "$(git status -s)" ]]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_git_changes() {
|
||||||
|
git diff
|
||||||
|
}
|
||||||
|
|
||||||
# PROGRAM
|
# PROGRAM
|
||||||
echo "Installing prettier..."
|
echo "Installing prettier..."
|
||||||
case $INPUT_PRETTIER_VERSION in
|
case $INPUT_PRETTIER_VERSION in
|
||||||
@@ -56,13 +60,12 @@ prettier $INPUT_PRETTIER_OPTIONS || { PRETTIER_RESULT=$?; echo "Problem running
|
|||||||
|
|
||||||
# To keep runtime good, just continue if something was changed
|
# To keep runtime good, just continue if something was changed
|
||||||
if _git_changed; then
|
if _git_changed; then
|
||||||
|
# case when --write is used with dry-run so if something is unpretty there will always have _git_changed
|
||||||
if $INPUT_DRY; then
|
if $INPUT_DRY; then
|
||||||
if [ "$PRETTIER_RESULT" -eq 1 ]; then
|
echo "Unpretty Files Changes:"
|
||||||
echo "Prettier found unpretty files!"
|
_git_changes
|
||||||
exit 1
|
echo "Finishing dry-run. Exiting before committing."
|
||||||
else
|
exit 1
|
||||||
echo "No unpretty files! Finishing dry-run."
|
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
# Calling method to configure the git environemnt
|
# Calling method to configure the git environemnt
|
||||||
_git_setup
|
_git_setup
|
||||||
@@ -91,5 +94,13 @@ if _git_changed; then
|
|||||||
echo "Changes pushed successfully."
|
echo "Changes pushed successfully."
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
|
# case when --check is used so there will never have something to commit but there are unpretty files
|
||||||
|
if [ "$PRETTIER_RESULT" -eq 1 ]; then
|
||||||
|
echo "Prettier found unpretty files!"
|
||||||
|
exit 1
|
||||||
|
else
|
||||||
|
echo "Finishing dry-run."
|
||||||
|
fi
|
||||||
|
echo "No unpretty files!"
|
||||||
echo "Nothing to commit. Exiting."
|
echo "Nothing to commit. Exiting."
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user