Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed branch parameter + Bugfix for prettier_version #14

Merged
merged 3 commits into from
May 4, 2020
Merged

Removed branch parameter + Bugfix for prettier_version #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d0861a
Removed branching parameter for testing
creyD Apr 27, 2020
bbeb9af
Removed $INPUT_BRANCH completely
creyD Apr 27, 2020
0ba5bcf
Fix for the PRETTIER_VERSION problems
creyD May 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ inputs:
description: Options for the `prettier` command
required: false
default: '--write **/*.js'
branch:
description: Target branch for the changes
required: true
dry:
description: Running the script in dry mode just shows whether there are files that should be prettified or not
required: false
Expand Down
27 changes: 9 additions & 18 deletions entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,16 @@ _git_changed() {
[[ -n "$(git status -s)" ]]
}

# Pushes to the according upstream (origin or input branch)
_git_push() {
if [ -z "$INPUT_BRANCH" ]
then
git push origin
else
git push --set-upstream origin "HEAD:$INPUT_BRANCH"
fi
}

# PROGRAM
echo "Installing prettier..."
if "$INPUT_PRETTIER_VERSION"; then
npm install --silent --global prettier@$INPUT_PRETTIER_VERSION
else
npm install --silent --global prettier
fi
case $INPUT_PRETTIER_VERSION in
false)
npm install --silent --global prettier
;;
*)
npm install --silent --global prettier@$INPUT_PRETTIER_VERSION
;;
esac

echo "Prettifing files..."
echo "Files:"
Expand All @@ -57,13 +50,11 @@ then
# Calling method to configure the git environemnt
_git_setup
echo "Commiting and pushing changes..."
# Switch to the actual branch
git checkout $INPUT_BRANCH || echo "Problem checking out the specified branch: $INPUT_BRANCH"
# Add changes to git
git add "${INPUT_FILE_PATTERN}" || echo "Problem adding your files with pattern ${INPUT_FILE_PATTERN}"
# Commit and push changes back
git commit -m "$INPUT_COMMIT_MESSAGE" --author="$GITHUB_ACTOR <[email protected]>" ${INPUT_COMMIT_OPTIONS:+"$INPUT_COMMIT_OPTIONS"}
_git_push
git push origin
echo "Changes pushed successfully."
fi
else
Expand Down