Merge pull request #182 from github/commit-author-fixes

fallback to `commit.commit.author.name`

README.md

@@ -87,6 +87,7 @@ Here are the configuration options for this Action:
 | `checkDiff` | yes | `"true"`                                       | An option to check that the PR diff only has a removal diff, with no additions - This option defaults to `"true"` but it can be disabled by setting it to `"false"` |
 | `checkLabels` | yes | `"true"`                                       | An option to check that the labels on the PR match those defined in the privileged requester config |
 | `commitVerification` | yes | `"false"` | Whether or not to validate all commits have proper verification via GPG signed commits |
+| `fallback_to_commit_author` | no | `"false"` | Whether or not to fallback to the commit author value if the commit login value is missing |
 
 ### Outputs 📤
 

action.yml

@@ -43,6 +43,10 @@ inputs:
     description: 'Whether or not to validate all commits have proper verification via GPG signed commits'
     required: true
     default: 'false'
+  fallback_to_commit_author:
+    description: 'Whether or not to fallback to the commit author value if the commit login value is missing'
+    required: true
+    default: 'false'
 outputs:
   approved: # output will be available to future steps
     description: "Whether or not the PR was approved - 'true' or 'false'"

src/runner.js

@@ -22,7 +22,21 @@ class Runner {
     core.debug(`checking commits: ${commits.length}`);
 
     for (const [, commit] of commits) {
-      const commitAuthor = commit.author.login.toLowerCase();
+      var commitAuthor = null;
+      try {
+        commitAuthor = commit.author.login.toLowerCase();
+      } catch (e) {
+        if (core.getBooleanInput("fallback_to_commit_author") === true) {
+          core.debug(`commit.author.login not found: ${e}`);
+          core.debug(
+            `trying commit.commit.author.name: ${commit.commit.author.name}`,
+          );
+          commitAuthor = commit.commit.author.name.toLowerCase();
+        } else {
+          throw new Error(`commit.author.login not found: ${e}`);
+        }
+      }
+
       const commitVerification = commit?.commit?.verification?.verified;
       const sha = commit?.sha;