mirror of
https://github.com/creyD/prettier_action.git
synced 2026-04-16 13:20:32 +02:00
Merge pull request #46 from fsz-codeshop/issue-37-dry-run-reporting-unpretty
Fixes Issue #37 [BUG] Dry run reporting unpretty files when all files match styles
This commit is contained in:
@@ -16,7 +16,7 @@ A GitHub action for styling files with [prettier](https://prettier.io).
|
|||||||
|
|
||||||
| Parameter | Required | Default | Description |
|
| Parameter | Required | Default | Description |
|
||||||
| - | :-: | :-: | - |
|
| - | :-: | :-: | - |
|
||||||
| dry | :x: | `false` | Runs the action in dry mode. Files wont get changed and the action fails if there are unprettified files. |
|
| dry | :x: | `false` | Runs the action in dry mode. Files wont get changed and the action fails if there are unprettified files. Recommended to use with prettier_options --check |
|
||||||
| prettier_version | :x: | `false` | Specific prettier version (by default use latest) |
|
| prettier_version | :x: | `false` | Specific prettier version (by default use latest) |
|
||||||
| prettier_options | :x: | `"--write **/*.js"` | Prettier options (by default it applies to the whole repository) |
|
| prettier_options | :x: | `"--write **/*.js"` | Prettier options (by default it applies to the whole repository) |
|
||||||
| commit_options | :x: | - | Custom git commit options |
|
| commit_options | :x: | - | Custom git commit options |
|
||||||
|
|||||||
@@ -55,9 +55,10 @@ if [ -n "$INPUT_PRETTIER_PLUGINS" ]; then
|
|||||||
fi
|
fi
|
||||||
)
|
)
|
||||||
|
|
||||||
echo "Prettifing files..."
|
PRETTIER_RESULT=0
|
||||||
|
echo "Prettifying files..."
|
||||||
echo "Files:"
|
echo "Files:"
|
||||||
prettier $INPUT_PRETTIER_OPTIONS || echo "Problem running prettier with $INPUT_PRETTIER_OPTIONS"
|
prettier $INPUT_PRETTIER_OPTIONS || { PRETTIER_RESULT=$?; echo "Problem running prettier with $INPUT_PRETTIER_OPTIONS"; }
|
||||||
|
|
||||||
# Ignore node modules and other action created files
|
# Ignore node modules and other action created files
|
||||||
rm -r node_modules/ || echo "No node_modules/ folder."
|
rm -r node_modules/ || echo "No node_modules/ folder."
|
||||||
@@ -66,8 +67,12 @@ git reset --hard package-lock.json || rm package-lock.json || echo "No package-
|
|||||||
# 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
|
||||||
if $INPUT_DRY; then
|
if $INPUT_DRY; then
|
||||||
echo "Prettier found unpretty files!"
|
if [ "$PRETTIER_RESULT" -eq 1 ]; then
|
||||||
exit 1
|
echo "Prettier found unpretty files!"
|
||||||
|
exit 1
|
||||||
|
else
|
||||||
|
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
|
||||||
|
|||||||
Reference in New Issue
Block a user