diff --git a/cmd/gopherbot/gopherbot.go b/cmd/gopherbot/gopherbot.go index 65651015..6f3c4bcf 100644 --- a/cmd/gopherbot/gopherbot.go +++ b/cmd/gopherbot/gopherbot.go @@ -1360,13 +1360,13 @@ func (b *gopherbot) getMinorMilestoneForMajor(ctx context.Context, majorRel stri // closeCherryPickIssues closes cherry-pick issues when CLs are merged to // release branches, as GitHub only does that on merge to master. func (b *gopherbot) closeCherryPickIssues(ctx context.Context) error { - openCherryPickIssues := make(map[int32]*maintner.GitHubIssue) // by GitHub Issue Number + cherryPickIssues := make(map[int32]*maintner.GitHubIssue) // by GitHub Issue Number b.gorepo.ForeachIssue(func(gi *maintner.GitHubIssue) error { - if gi.Closed || gi.PullRequest || gi.NotExist || gi.Milestone.IsNone() { + if gi.Closed || gi.PullRequest || gi.NotExist || gi.Milestone.IsNone() || gi.HasEvent("reopened") { return nil } if strings.Count(gi.Milestone.Title, ".") == 2 { // minor release - openCherryPickIssues[gi.Number] = gi + cherryPickIssues[gi.Number] = gi } return nil }) @@ -1388,7 +1388,7 @@ func (b *gopherbot) closeCherryPickIssues(ctx context.Context) error { if id := ref.Repo.ID(); id.Owner != "golang" || id.Repo != "go" { continue } - gi, ok := openCherryPickIssues[ref.Number] + gi, ok := cherryPickIssues[ref.Number] if !ok { continue }