From 436859b54d05b1e8966c1abade8c0ce272ec9401 Mon Sep 17 00:00:00 2001
From: Martin Yeo <martin.yeo@metoffice.gov.uk>
Date: Wed, 9 Mar 2022 14:59:20 +0000
Subject: [PATCH 1/2] Overnight benchmarks find a valid issue assignee.

---
 .github/workflows/benchmark.yml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index 6b155fc8bc..585f5a2cd0 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -81,7 +81,16 @@ jobs:
             do
               commit="${commit_file%.*}"
               pr_number=$(git log "$commit"^! --oneline | grep -o "#[0-9]*" | tail -1 | cut -c 2-)
-              assignee=$(gh pr view $pr_number --json author -q '.["author"]["login"]' --repo $GITHUB_REPOSITORY)
+              author=$(gh pr view $pr_number --json author -q '.["author"]["login"]' --repo $GITHUB_REPOSITORY)
+              merger=$(gh pr view $pr_number --json mergedBy -q '.["mergedBy"]["login"]' --repo $GITHUB_REPOSITORY)
+              # Find a valid assignee from author/merger/nothing.
+              if curl -s https://api.github.com/users/$author | grep -q $author; then
+                assignee=$author
+              elif curl -s https://api.github.com/users/$merger | grep -q $merger; then
+                assignee=$merger
+              else
+                assignee=""
+              fi
               title="Performance Shift(s): \`$commit\`"
               body="
           Benchmark comparison has identified performance shifts at commit \

From cd948fc564a33efad3c6344d1880493346f131b4 Mon Sep 17 00:00:00 2001
From: Martin Yeo <martin.yeo@metoffice.gov.uk>
Date: Wed, 9 Mar 2022 15:55:37 +0000
Subject: [PATCH 2/2] Overnight benchmarks safer check for a valid issue
 assignee.

---
 .github/workflows/benchmark.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index 585f5a2cd0..04e26686ea 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -84,9 +84,9 @@ jobs:
               author=$(gh pr view $pr_number --json author -q '.["author"]["login"]' --repo $GITHUB_REPOSITORY)
               merger=$(gh pr view $pr_number --json mergedBy -q '.["mergedBy"]["login"]' --repo $GITHUB_REPOSITORY)
               # Find a valid assignee from author/merger/nothing.
-              if curl -s https://api.github.com/users/$author | grep -q $author; then
+              if curl -s https://api.github.com/users/$author | grep -q "login"; then
                 assignee=$author
-              elif curl -s https://api.github.com/users/$merger | grep -q $merger; then
+              elif curl -s https://api.github.com/users/$merger | grep -q "login"; then
                 assignee=$merger
               else
                 assignee=""