toolshed/abra
4
2
Fork 18
Code Issues 24 Pull Requests Packages Releases 41 Activity

fix: fail if release conflicts

Browse Source 
See toolshed/organising#638
This commit is contained in:
decentral1se
2025-10-01 11:18:30 +02:00
parent 1ad8c127d9
commit fd642ddb84
2 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cli/recipe/release.go
View File

@ -135,14 +135,23 @@ your private key and enter your passphrase beforehand.
log.Fatal(err)
}
if tagString == "" && (!internal.Major && !internal.Minor && !internal.Patch) {
var err error
tagString, err = getLabelVersion(recipe, false)
if err != nil {
log.Fatal(err)
labelVersion, err := getLabelVersion(recipe, false)
if err != nil {
log.Fatal(err)
}
for _, tag := range tags {
previousTagLeftHand := strings.Split(tag, "+")[0]
newTagStringLeftHand := strings.Split(labelVersion, "+")[0]
if previousTagLeftHand == newTagStringLeftHand {
log.Fatal(i18n.G("%s+... conflicts with a previous release: %s", newTagStringLeftHand, tag))
}
}
if tagString == "" && (!internal.Major && !internal.Minor && !internal.Patch) {
tagString = labelVersion
}
isClean, err := gitPkg.IsClean(recipe.Dir)
if err != nil {
log.Fatal(err)