Skip to content

Commit

Permalink
fix: use correct SHA for changelogs
Browse files Browse the repository at this point in the history
  • Loading branch information
christophwitzko committed May 24, 2017
1 parent cd848cc commit a0e0442
Showing 1 changed file with 13 additions and 6 deletions.
19 changes: 13 additions & 6 deletions semrel.go
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,18 @@ func (repo *Repository) GetLatestRelease(vrange string) (*Release, error) {
opts.Page = resp.NextPage
}
sort.Sort(allReleases)

var lastRelease *Release
for _, r := range allReleases {
if r.Version.Prerelease() == "" {
lastRelease = r
break
}
}

if vrange == "" {
for _, r := range allReleases {
if r.Version.Prerelease() == "" {
return r, nil
}
if lastRelease != nil {
return lastRelease, nil
}
return &Release{"", &semver.Version{}}, nil
}
Expand All @@ -164,14 +171,14 @@ func (repo *Repository) GetLatestRelease(vrange string) (*Release, error) {

splitPre := strings.SplitN(vrange, "-", 2)
if len(splitPre) == 1 {
return &Release{allReleases[0].SHA, nver}, nil
return &Release{lastRelease.SHA, nver}, nil
}

npver, err := nver.SetPrerelease(splitPre[1])
if err != nil {
return nil, err
}
return &Release{allReleases[0].SHA, &npver}, nil
return &Release{lastRelease.SHA, &npver}, nil
}

func (repo *Repository) CreateRelease(commits []*Commit, latestRelease *Release, newVersion *semver.Version, branch string) error {
Expand Down

0 comments on commit a0e0442

Please sign in to comment.