diff options
Diffstat (limited to 'dist/index.js')
| -rw-r--r-- | dist/index.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dist/index.js b/dist/index.js index fe3f317..57729b2 100644 --- a/dist/index.js +++ b/dist/index.js @@ -2021,7 +2021,7 @@ function getInputs() { } } // SHA? - else if (result.ref.match(/^[0-9a-fA-F]{40}$/)) { + else if (result.ref.match(/^(?:[0-9a-fA-F]{40}|[0-9a-fA-F]{64})$/)) { result.commit = result.ref; result.ref = ''; } @@ -2444,7 +2444,7 @@ function checkCommitInfo(token, commitInfo, repositoryOwner, repositoryName, ref return; } // Extract details from message - const match = commitInfo.match(/Merge ([0-9a-f]{40}) into ([0-9a-f]{40})/); + const match = commitInfo.match(/Merge ([0-9a-f]{40}|[0-9a-f]{64}) into ([0-9a-f]{40}|[0-9a-f]{64})/); if (!match) { core.debug('Unexpected message format'); return; |