Merge pull request juju#15996 from barrettj12/merge-3.1-3.2-20230725

juju#15996

Merges the following patches:
- juju#15989
- juju#15951

### Conflicts
None.

.github/workflows/merge.yml

@@ -91,4 +91,4 @@ jobs:
           curl https://github.com/mattermost/mmctl/releases/download/v7.8.5/linux_amd64.tar -Lo mmctl.tar
           tar -xvf mmctl.tar
           ./mmctl auth login 'https://chat.charmhub.io' --name Charmhub --access-token $MM_TOKEN
-          ./mmctl post create Charmhub:juju-watercooler --message "$MESSAGE"
+          ./mmctl post create Charmhub:juju-bot --message "$MESSAGE"

scripts/try-merge/main.go

@@ -168,7 +168,8 @@ type commitInfo struct {
 }
 
 type prInfo struct {
-	Number int `json:"number"`
+	Number int    `json:"number"`
+	State  string `json:"state"`
 }
 
 // Check if there is already an open merge containing this commit. If so,
@@ -178,18 +179,22 @@ func commitHasOpenPR(commit commitInfo) (prNumber int, ok bool) {
 		command: "gh",
 		args: []string{"pr", "list",
 			"--search", commit.SHA,
-			"--state", "open",
+			"--state", "all",
 			"--base", targetBranch,
-			"--json", "number",
+			"--json", "number,state",
 		},
 	})
 	handleExecuteError(ghRes)
 
 	prList := []prInfo{}
 	check(json.Unmarshal(ghRes.stdout, &prList))
 
-	if len(prList) > 0 {
-		return prList[0].Number, true
+	for _, pr := range prList {
+		// Check for merged PRs, just in case the merge PR landed while we've been
+		// checking for conflicts.
+		if pr.State == "OPEN" || pr.State == "MERGED" {
+			return pr.Number, true
+		}
 	}
 	return -1, false
 }