Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ then
exit 0
fi
# already a pre-release available, bump it
if [[ "$pre_tag" =~ $new ]] && [[ "$pre_tag" =~ $suffix ]]
if [[ ! "$pre_tag" =~ $tag ]] && [[ "$pre_tag" =~ $suffix ]]
then
new=${tagPrefix}$(semver -i prerelease "${pre_tag}" --preid "${suffix}")
echo -e "Bumping ${suffix} pre-tag ${pre_tag}. New pre-tag ${new}"
Expand Down
58 changes: 58 additions & 0 deletions test/test_prefix.bats
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -123,4 +123,62 @@ run_entry() {
assert_success
assert_line "Bumping tag infra/1.7.0 - New tag infra/1.8.0"
refute_line "Bumping tag 2.1.0 - New tag 2.2.0"
}

@test "Bumps correctly prerelease on new version with existing prereleases" {
# Arrange
export SOURCE="$SOURCE"
export DRY_RUN="true"
export PRERELEASE="true"
export PRERELEASE_SUFFIX=rc
export RELEASE_BRANCHES=moin
export DEFAULT_BUMP=major
git tag "1.0.0" && git commit -m "previous-version" --allow-empty >/dev/null
git tag "2.0.0-rc.0" && git commit -m "new-version-prerelease" --allow-empty >/dev/null


# Act
run run_entry

# Assert
assert_success
assert_line "Bumping rc pre-tag 2.0.0-rc.0. New pre-tag 2.0.0-rc.1"
}

@test "Bumps correctly prerelease on new version without existing prereleases" {
# Arrange
export SOURCE="$SOURCE"
export DRY_RUN="true"
export PRERELEASE="true"
export PRERELEASE_SUFFIX=rc
export RELEASE_BRANCHES=moin
export DEFAULT_BUMP=major
git tag "1.0.0" && git commit -m "previous-version" --allow-empty >/dev/null


# Act
run run_entry

# Assert
assert_success
assert_line "Setting rc pre-tag - With pre-tag 2.0.0-rc.0"
}

@test "Bumps correctly tag with existing prereleases" {
# Arrange
export SOURCE="$SOURCE"
export DRY_RUN="true"
export PRERELEASE_SUFFIX=rc
export RELEASE_BRANCHES=moin
export DEFAULT_BUMP=major
git tag "1.0.0" && git commit -m "previous-version" --allow-empty >/dev/null
git tag "2.0.0-rc.0" && git commit -m "new-version-prerelease" --allow-empty >/dev/null


# Act
run run_entry

# Assert
assert_success
assert_line "Bumping tag 1.0.0 - New tag 2.0.0"
}