fix(github): remove 'draft' option because releases will always be published public

This commit is contained in:
fwiedmann
2019-08-13 23:01:38 +02:00
parent e0a4725f06
commit a6c651a97f
10 changed files with 30 additions and 57 deletions

View File

@@ -40,29 +40,24 @@ func (c *Calculator) IncPrerelease(preReleaseType string, version *semver.Versio
}
//CalculateNewVersion from given commits and lastversion
func (c *Calculator) CalculateNewVersion(commits map[shared.Release][]shared.AnalyzedCommit, lastVersion *semver.Version, releaseType string, firstRelease bool) (semver.Version, bool) {
func (c *Calculator) CalculateNewVersion(commits map[shared.Release][]shared.AnalyzedCommit, lastVersion *semver.Version, releaseType string, firstRelease bool) semver.Version {
switch releaseType {
case "beta", "alpha":
case "beta", "alpha", "rc":
if len(commits["major"]) > 0 || len(commits["minor"]) > 0 || len(commits["patch"]) > 0 {
version, _ := c.IncPrerelease(releaseType, lastVersion)
return version, true
}
case "rc":
if len(commits["major"]) > 0 || len(commits["minor"]) > 0 || len(commits["patch"]) > 0 {
version, _ := c.IncPrerelease(releaseType, lastVersion)
return version, false
return version
}
case "release":
if !firstRelease {
if len(commits["major"]) > 0 {
return lastVersion.IncMajor(), false
return lastVersion.IncMajor()
} else if len(commits["minor"]) > 0 {
return lastVersion.IncMinor(), false
return lastVersion.IncMinor()
} else if len(commits["patch"]) > 0 {
return lastVersion.IncPatch(), false
return lastVersion.IncPatch()
}
}
}
return *lastVersion, false
return *lastVersion
}

View File

@@ -72,7 +72,6 @@ func TestCalculator_CalculateNewVersion(t *testing.T) {
releaseType string
lastVersion *semver.Version
nextVersion string
isDraft bool
isFirst bool
analyzedCommits map[shared.Release][]shared.AnalyzedCommit
}{
@@ -90,7 +89,6 @@ func TestCalculator_CalculateNewVersion(t *testing.T) {
"none": []shared.AnalyzedCommit{},
},
isFirst: false,
isDraft: true,
},
{
testCase: "version with preRelease beta",
@@ -106,7 +104,6 @@ func TestCalculator_CalculateNewVersion(t *testing.T) {
"none": []shared.AnalyzedCommit{},
},
isFirst: false,
isDraft: true,
},
{
testCase: "version without commits",
@@ -120,7 +117,6 @@ func TestCalculator_CalculateNewVersion(t *testing.T) {
"none": []shared.AnalyzedCommit{},
},
isFirst: false,
isDraft: false,
},
{
testCase: "version with commits and first release",
@@ -134,7 +130,6 @@ func TestCalculator_CalculateNewVersion(t *testing.T) {
"none": []shared.AnalyzedCommit{},
},
isFirst: true,
isDraft: false,
},
{
testCase: "version with commits and rc release",
@@ -148,7 +143,6 @@ func TestCalculator_CalculateNewVersion(t *testing.T) {
"none": []shared.AnalyzedCommit{},
},
isFirst: false,
isDraft: false,
},
{
testCase: "version with commits and rc release",
@@ -162,7 +156,6 @@ func TestCalculator_CalculateNewVersion(t *testing.T) {
"none": []shared.AnalyzedCommit{},
},
isFirst: false,
isDraft: false,
},
{
testCase: "version with commits and major release",
@@ -176,7 +169,6 @@ func TestCalculator_CalculateNewVersion(t *testing.T) {
"none": []shared.AnalyzedCommit{},
},
isFirst: false,
isDraft: false,
},
{
testCase: "version with commits and minor release",
@@ -190,7 +182,6 @@ func TestCalculator_CalculateNewVersion(t *testing.T) {
"none": []shared.AnalyzedCommit{},
},
isFirst: false,
isDraft: false,
},
{
testCase: "version with commits and minor patch",
@@ -204,15 +195,13 @@ func TestCalculator_CalculateNewVersion(t *testing.T) {
"none": []shared.AnalyzedCommit{},
},
isFirst: false,
isDraft: false,
},
}
c := calculator.New()
for _, test := range testConfigs {
next, draft := c.CalculateNewVersion(test.analyzedCommits, test.lastVersion, test.releaseType, test.isFirst)
assert.Equalf(t, test.isDraft, draft, "Should have draft %t for testcase %s", test.isDraft, test.testCase)
next := c.CalculateNewVersion(test.analyzedCommits, test.lastVersion, test.releaseType, test.isFirst)
assert.Equalf(t, test.nextVersion, next.String(), "Should have version %s for testcase %s", test.nextVersion, test.testCase)
}