diff --git a/__mocks__/@actions/github.ts b/__mocks__/@actions/github.ts index 14df365..a36ff9c 100644 --- 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/src/context.ts b/src/context.ts index f2b7348..7d69c53 100644 --- 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(); + } }