Skip to content

Commit

Permalink
Update entrypoint.sh to consider dry run
Browse files Browse the repository at this point in the history
When dry-run is set to true and we use the --write flag, we expect to
see what files we'll need to reformat without pushing to remote.
However, this requires us to commit the updated changes caused by
prettier. Previously, the placement of the dry run logic was done before
committing the formatted files, resulting to us not seeing the expected
files format. And only using the '--write' flag will not result to a
failure even if there are files that requires formatting.

By moving the logic after committing the prettier files, it will show us
the comparison between two files, without pushing to remote
(given that we use dry flag to true).
  • Loading branch information
Anu48 committed Apr 24, 2024
1 parent 9c0188e commit 38602fe
Showing 1 changed file with 15 additions and 7 deletions.
22 changes: 15 additions & 7 deletions prettier/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,15 @@ prettier_output_summary() {
)
}

dry_run_check() {
# case when --write is used with dry-run so if something is unpretty there will always have _git_changed
if _dry_run; then
summarize_changes 'Unpretty Files Changes'
echo "Finishing dry-run. Exiting before committing." | tee -a "$GITHUB_STEP_SUMMARY"
exit 1
fi
}

npx prettier $prettier_options > "$prettier_out" 2> "$prettier_err" \
|| {
PRETTIER_RESULT=$?;
Expand Down Expand Up @@ -215,13 +224,6 @@ if ! _git_changed; then
exit
fi

# case when --write is used with dry-run so if something is unpretty there will always have _git_changed
if _dry_run; then
summarize_changes 'Unpretty Files Changes'
echo "Finishing dry-run. Exiting before committing." | tee -a "$GITHUB_STEP_SUMMARY"
exit 1
fi

# Calling method to configure the git environment
_git_setup

Expand All @@ -248,6 +250,9 @@ if _amend_commit; then
git pull
git commit --amend --no-edit
) | tee -a "$GITHUB_STEP_SUMMARY"

dry_run_check

if _has_upstream; then
git push origin -f || failed_push=1
fi
Expand All @@ -258,6 +263,9 @@ else
else
git commit -n -m "$INPUT_COMMIT_MESSAGE" ${INPUT_COMMIT_OPTIONS:+"$INPUT_COMMIT_OPTIONS"} || commit_canary=
fi

dry_run_check

if [ -n "$commit_canary" ]; then
log_blame_rev "Prettier"
else
Expand Down

0 comments on commit 38602fe

Please sign in to comment.