From b87d48154a87a85666003575337e27b8cd65f691 Mon Sep 17 00:00:00 2001 From: Ade Hery Shopyan <51158020+adeherysh@users.noreply.github.com> Date: Tue, 13 Dec 2022 19:51:58 +0700 Subject: [PATCH] fix(chore): bugs autosquash always set true (#103) * fix(chore): bugs autosquash always set true * fix(chore): autosquash input default as string --- action.yml | 4 ++-- entrypoint.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/action.yml b/action.yml index fd82666..ba526f0 100644 --- a/action.yml +++ b/action.yml @@ -8,7 +8,7 @@ inputs: autosquash: description: Should the rebase autosquash fixup and squash commits required: false - default: false + default: 'false' branding: icon: git-pull-request - color: purple \ No newline at end of file + color: purple diff --git a/entrypoint.sh b/entrypoint.sh index e776c9d..c251a33 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -100,7 +100,7 @@ git fetch fork $HEAD_BRANCH # do the rebase git checkout -b fork/$HEAD_BRANCH fork/$HEAD_BRANCH -if [[ $INPUT_AUTOSQUASH -eq 'true' ]]; then +if [[ $INPUT_AUTOSQUASH == 'true' ]]; then GIT_SEQUENCE_EDITOR=: git rebase -i --autosquash origin/$BASE_BRANCH else git rebase origin/$BASE_BRANCH