cmd/releasebot: clean up okay-after-beta1 label on more issues

The first beta release takes place after all issues that are both
release-blocking and not okay after beta1 are resolved. After the
release goes out, releasebot removes the 'okay-after-beta1' label
from all issues in that milestone to reduce noise, since the label
by that time loses its original meaning.

However, some release-blocking issues that are okay after beta 1
sometimes end up being unmarked as release-blockers. Improve the
removeOkayAfterBeta1 behavior to clean up such issues too.

Updates golang/go#50168.

Change-Id: Id04c0dabf35d928c86ababd46d6eb97b1fb83621
Reviewed-on: https://go-review.googlesource.com/c/build/+/372535
Run-TryBot: Dmitri Shuralyov <dmitshur@golang.org>
Trust: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Alex Rakoczy <alex@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
diff --git a/cmd/releasebot/github.go b/cmd/releasebot/github.go
index cbced62..ea3bd64 100644
--- a/cmd/releasebot/github.go
+++ b/cmd/releasebot/github.go
@@ -275,6 +275,7 @@
 
 }
 
+// removeOkayAfterBeta1 cleans up the okay-after-beta1 label after the beta1 release is out.
 func (w *Work) removeOkayAfterBeta1() {
 	if !w.BetaRelease || !strings.HasSuffix(w.Version, "beta1") {
 		// Nothing to do.
@@ -288,7 +289,7 @@
 		if gi.Number == int32(w.ReleaseIssue) {
 			return nil
 		}
-		if gi.Closed || !gi.HasLabel("release-blocker") || !gi.HasLabel("okay-after-beta1") {
+		if gi.Closed || !gi.HasLabel("okay-after-beta1") {
 			return nil
 		}
 		w.log.Printf("removing okay-after-beta1 label in issue %d", gi.Number)