diff --git a/action.yml b/action.yml index 4fca01f..de6218f 100644 --- a/action.yml +++ b/action.yml @@ -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 diff --git a/entrypoint.sh b/entrypoint.sh index b39676d..91abb9c 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -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:" @@ -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 <$GITHUB_ACTOR@users.noreply.github.com>" ${INPUT_COMMIT_OPTIONS:+"$INPUT_COMMIT_OPTIONS"} - _git_push + git push origin echo "Changes pushed successfully." fi else