Merge pull request #478 from crazy-max/commit-date-request

commiter_date: fix github api request fallback
docker · Nov 19, 2024 · 8cb0002 · 8cb0002
2 parents 359e915 + e01ddd3
commit 8cb0002
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 10 deletions.
diff --git a/__mocks__/@actions/github.ts b/__mocks__/@actions/github.ts
@@ -205,5 +205,19 @@ export const context = {
 };
 
 export const getOctokit = jest.fn(() => ({
-  request: () => Promise.resolve({data: {committer: {date: '2024-11-13T13:42:28Z'}}})
+  rest: {
+    repos: {
+      getCommit: jest.fn(() =>
+        Promise.resolve({
+          data: {
+            commit: {
+              committer: {
+                date: '2024-11-13T13:42:28Z'
+              }
+            }
+          }
+        })
+      )
+    }
+  }
 }));
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/context.ts b/src/context.ts
@@ -119,11 +119,18 @@ async function getCommitDateFromWorkflow(sha: string, toolkit: Toolkit): Promise
   }
 
   // fallback to github api for commit date
-  const commit = await toolkit.github.octokit.request('GET /repos/{owner}/{repo}/commits/{commit_sha}', {
-    commit_sha: sha,
-    owner: GitHub.context.repo.owner,
-    repo: GitHub.context.repo.repo
-  });
-
-  return new Date(commit.data.committer.date);
+  try {
+    const commit = await toolkit.github.octokit.rest.repos.getCommit({
+      owner: GitHub.context.repo.owner,
+      repo: GitHub.context.repo.repo,
+      ref: sha
+    });
+    if (commit.data.commit.committer?.date) {
+      return new Date(commit.data.commit.committer.date);
+    }
+    throw new Error('Committer date not found');
+  } catch (error) {
+    core.debug(`Failed to get commit date from GitHub API: ${error.message}`);
+    return new Date();
+  }
 }