Fixes for the try GitHub Action (#30024)

1. Properly handle multi-line comments
2. Don't skip duplicate workflows when explicitly running try
This commit is contained in:
Martin Robinson 2023-07-25 12:33:26 +02:00 committed by GitHub
parent 7508d8321a
commit f7fcc6e900
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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"); let tagIndex = tokens.indexOf("@bors-servo");
if (tagIndex == -1 || tagIndex + 1 >= tokens.length) { if (tagIndex == -1 || tagIndex + 1 >= tokens.length) {
return { try: false }; return { try: false };
@ -50,13 +50,14 @@ jobs:
} }
if (returnValue.try) { if (returnValue.try) {
let username = context.payload.event.sender.login;
let result = await github.rest.repos.getCollaboratorPermissionLevel({ let result = await github.rest.repos.getCollaboratorPermissionLevel({
owner: context.repo.owner, owner: context.repo.owner,
repo: context.repo.repo, repo: context.repo.repo,
username: "${{ github.event.sender.login }}" username
}); });
if (!result.data.user.permissions.push) { 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 }; return { try: false };
} }
} }