Skip to content

Commit 6ec7679

Browse files
authored
Revert "Fixes anothrNick#309"
1 parent 945dd6d commit 6ec7679

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ _NOTE: set the fetch-depth for `actions/checkout@v2` or newer to be sure you ret
105105
- `last`: show the single last commit
106106
- `compare`: show all commits since previous repo tag number
107107
- **FORCE_WITHOUT_CHANGES** _(optional)_ - Enforce the brach creation even if there are no changes from the tag.
108-
- **FORCE_WITHOUT_CHANGES_PRE** _(optional)_ - Similar to force without changes, for pre-releases.
109108

110109
### Outputs
111110

entrypoint.sh

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ patch_string_token=${PATCH_STRING_TOKEN:-#patch}
2222
none_string_token=${NONE_STRING_TOKEN:-#none}
2323
branch_history=${BRANCH_HISTORY:-compare}
2424
force_without_changes=${FORCE_WITHOUT_CHANGES:-false}
25-
force_without_changes_pre=${FORCE_WITHOUT_CHANGES:-false}
2625

2726
# since https://github.blog/2022-04-12-git-security-vulnerability-announced/ runner uses?
2827
git config --global --add safe.directory /github/workspace
@@ -48,8 +47,7 @@ echo -e "\tMINOR_STRING_TOKEN: ${minor_string_token}"
4847
echo -e "\tPATCH_STRING_TOKEN: ${patch_string_token}"
4948
echo -e "\tNONE_STRING_TOKEN: ${none_string_token}"
5049
echo -e "\tBRANCH_HISTORY: ${branch_history}"
51-
echo -e "\tFORCE_WITHOUT_CHANGES: ${force_without_changes}"
52-
echo -e "\tFORCE_WITHOUT_CHANGES_PRE: ${force_without_changes_pre}"
50+
echo -e "\tFORCE: ${force_without_changes}"
5351

5452
# verbose, show everything
5553
if $verbose
@@ -129,7 +127,7 @@ tag_commit=$(git rev-list -n 1 "$tag" || true )
129127
# get current commit hash
130128
commit=$(git rev-parse HEAD)
131129
# skip if there are no new commits for non-pre_release
132-
if [ "$tag_commit" == "$commit" ] && [ "$force_without_changes" == "false" ]
130+
if [ "$tag_commit" == "$commit" ] && [ "$force_without_changes" == "false" ]
133131
then
134132
echo "No new commits since previous tag. Skipping..."
135133
setOutput "new_tag" "$tag"
@@ -192,7 +190,7 @@ then
192190
# get current commit hash for tag
193191
pre_tag_commit=$(git rev-list -n 1 "$pre_tag" || true)
194192
# skip if there are no new commits for pre_release
195-
if [ "$pre_tag_commit" == "$commit" ] && [ "$pre_force_without_changes" == "false" ]
193+
if [ "$pre_tag_commit" == "$commit" ]
196194
then
197195
echo "No new commits since previous pre_tag. Skipping..."
198196
setOutput "new_tag" "$pre_tag"
@@ -283,4 +281,4 @@ EOF
283281
else
284282
# use git cli to push
285283
git push -f origin "$new" || exit 1
286-
fi
284+
fi

0 commit comments

Comments
 (0)