From f7fcc6e900d0427f99dc3f0b82671adac6947ad6 Mon Sep 17 00:00:00 2001
From: Martin Robinson <mrobinson@igalia.com>
Date: Tue, 25 Jul 2023 12:33:26 +0200
Subject: [PATCH] Fixes for the try GitHub Action (#30024)

1. Properly handle multi-line comments
2. Don't skip duplicate workflows when explicitly running try
---
 .github/workflows/try.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/try.yml b/.github/workflows/try.yml
index 336f2935b93..439336db3c5 100644
--- a/.github/workflows/try.yml
+++ b/.github/workflows/try.yml
@@ -23,7 +23,7 @@ jobs:
                 })
             }
 
-            let tokens = "${{ github.event.comment.body }}".split(" ");
+            let tokens = context.payload.comment.body.split(/\s+/);
             let tagIndex = tokens.indexOf("@bors-servo");
             if (tagIndex == -1 || tagIndex + 1 >= tokens.length) {
               return { try: false };
@@ -50,13 +50,14 @@ jobs:
             }
 
             if (returnValue.try) {
+              let username = context.payload.event.sender.login;
               let result = await github.rest.repos.getCollaboratorPermissionLevel({
                 owner: context.repo.owner,
                 repo: context.repo.repo,
-                username: "${{ github.event.sender.login }}"
+                username
               });
               if (!result.data.user.permissions.push) {
-                makeComment('🔒 User @${{ github.event.sender.login }} does not have permission to trigger try jobs.');
+                makeComment('🔒 User @' + username + ' does not have permission to trigger try jobs.');
                 return { try: false };
               }
             }