fix: add MergeCommitSHA check, _PR substitution, PR limit in publish-release automation command (#1833)

add MergeCommitSHA check, _PR substitution, PR limit in publish-release
automation command

#1786
#1810

Author: catchyzheng

internal/automation/trigger.go

@@ -122,6 +122,8 @@ func runCommandWithConfig(ctx context.Context, client CloudBuildClient, ghClient
 			if len(prs) == 0 {
 				slog.Info("No pull requests with label 'release:pending' found. Skipping 'publish-release' trigger.", slog.String("repository", repository.Name))
 				continue
+			} else {
+				substitutions["_PR"] = fmt.Sprintf("%v", prs[0].GetHTMLURL())
 			}
 		} else if command == "generate" {
 			// only pass _BUILD to generate trigger

internal/automation/trigger_test.go

@@ -126,7 +126,7 @@ func TestRunCommandWithClient(t *testing.T) {
 					Id:   "publish-release-trigger-id",
 				},
 			},
-			ghPRs: []*github.PullRequest{{}},
+			ghPRs: []*github.PullRequest{{HTMLURL: github.Ptr("https://github.com/googleapis/librarian/pull/1")}},
 		},
 		{
 			name:    "skips publish-release with no PRs",

internal/github/github.go

@@ -270,11 +270,11 @@ func (c *Client) FindMergedPullRequestsWithPendingReleaseLabel(ctx context.Conte
 			return nil, err
 		}
 		for _, pr := range prs {
-			if pr.GetMerged() && hasLabel(pr, "release:pending") {
+			if (pr.GetMerged() || pr.GetMergeCommitSHA() != "") && hasLabel(pr, "release:pending") {
 				allPRs = append(allPRs, pr)
 			}
 		}
-		if resp.NextPage == 0 {
+		if resp.NextPage == 0 || len(allPRs) >= 10 {
 			break
 		}
 		opt.Page = resp.NextPage

internal/github/github_test.go

@@ -950,18 +950,20 @@ func TestFindMergedPullRequestsWithPendingReleaseLabel(t *testing.T) {
 				if r.URL.Query().Get("state") != "closed" {
 					t.Errorf("unexpected state: got %q", r.URL.Query().Get("state"))
 				}
+				pr0 := github.PullRequest{Number: github.Ptr(0), HTMLURL: github.Ptr("https://github.com/owner/repo/pull/0"), MergeCommitSHA: github.Ptr("sha456"), Labels: []*github.Label{{Name: github.Ptr("release:pending")}}}
 				pr1 := github.PullRequest{Number: github.Ptr(1), Labels: []*github.Label{{Name: github.Ptr("release:pending")}}}
 				pr2 := github.PullRequest{Number: github.Ptr(2), Labels: []*github.Label{{Name: github.Ptr("other-label")}}}
-				pr3 := github.PullRequest{Number: github.Ptr(4), Merged: github.Ptr(true), Labels: []*github.Label{{Name: github.Ptr("release:pending")}}}
-				prs := []*github.PullRequest{&pr1, &pr2, &pr3}
+				pr3 := github.PullRequest{Number: github.Ptr(3), HTMLURL: github.Ptr("https://github.com/owner/repo/pull/3"), MergeCommitSHA: github.Ptr("sha123"), Merged: github.Ptr(true), Labels: []*github.Label{{Name: github.Ptr("release:pending")}}}
+				prs := []*github.PullRequest{&pr0, &pr1, &pr2, &pr3}
 				b, err := json.Marshal(prs)
 				if err != nil {
 					t.Fatalf("json.Marshal() failed: %v", err)
 				}
 				fmt.Fprint(w, string(b))
 			},
 			wantPRs: []*PullRequest{
-				{Number: github.Ptr(4), Merged: github.Ptr(true), Labels: []*github.Label{{Name: github.Ptr("release:pending")}}},
+				{Number: github.Ptr(0), HTMLURL: github.Ptr("https://github.com/owner/repo/pull/0"), MergeCommitSHA: github.Ptr("sha456"), Labels: []*github.Label{{Name: github.Ptr("release:pending")}}},
+				{Number: github.Ptr(3), HTMLURL: github.Ptr("https://github.com/owner/repo/pull/3"), MergeCommitSHA: github.Ptr("sha123"), Merged: github.Ptr(true), Labels: []*github.Label{{Name: github.Ptr("release:pending")}}},
 			},
 		},
 		{