diff --git a/CHANGELOG.md b/CHANGELOG.md index 24eb909..0e9289c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +* [PR-19](https://github.com/itk-dev/gh-itkdev/pull/19) + Always use release/{version} branch naming convention * [PR-16](https://github.com/itk-dev/gh-itkdev/pull/16) Added version check to determine release type * [PR-15](https://github.com/itk-dev/gh-itkdev/pull/15) diff --git a/changelog/release.go b/changelog/release.go index b0e7388..3f9efc2 100644 --- a/changelog/release.go +++ b/changelog/release.go @@ -24,15 +24,9 @@ func getBranchName(release string) (string, error) { return "", fmt.Errorf("invalid version: %s", release) } - branchType := "release" - // Determine if the release is a "release" or a "hotfix". - // - // A "hotfix" is a version that's not a prerelease and has a patch version different from 0 (cf. https://semver.org/). - if semver.Prerelease(version) == "" && semver.MajorMinor(version)+".0" != version { - branchType = "hotfix" - } - - return branchType + "/" + release, nil + // Our default Woodpecker setup only triggers on release/* branches, + // so always use that naming scheme, regardless of the nature of the change. + return "release/" + release, nil } func createReleaseBranch(release string, base string) (string, error) { diff --git a/changelog/release_test.go b/changelog/release_test.go index a0c74ea..5599c74 100644 --- a/changelog/release_test.go +++ b/changelog/release_test.go @@ -26,7 +26,7 @@ func TestBranchName(t *testing.T) { }, { "v0.0.1", - "hotfix/v0.0.1", + "release/v0.0.1", "", }, {