Skip to content

Commit 6ab9fd6

Browse files
committed
Fix github rest endpoint usage
1 parent f163302 commit 6ab9fd6

File tree

5 files changed

+11
-44
lines changed

5 files changed

+11
-44
lines changed

dist/main.js

Lines changed: 4 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/main.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock.json

Lines changed: 0 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
},
3636
"devDependencies": {
3737
"@commitlint/cli": "^19.8.1",
38-
"@octokit/types": "^14.1.0",
3938
"@types/node": "^22.16.0",
4039
"commitlint-config-non-conventional": "^1.0.1",
4140
"eslint": "^9.30.1",

src/get-changed-files.ts

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
import { getOctokit, context } from '@actions/github';
2-
import { GetResponseDataTypeFromEndpointMethod } from '@octokit/types';
32

43
import { File, FileNamesList } from './types';
54
import inputs from './inputs';
65

7-
const getFileNames = (files: File[]): FileNamesList => files
8-
.filter((file) => file.status !== 'removed')
9-
.map((file) => file.filename);
6+
const getFileNames = (files: File[]): FileNamesList =>
7+
files.filter((file) => file.status !== 'removed').map((file) => file.filename);
108

119
const getChangedFiles = async (): Promise<FileNamesList> => {
1210
const octokit = getOctokit(inputs.token);
@@ -15,29 +13,20 @@ const getChangedFiles = async (): Promise<FileNamesList> => {
1513
let filenames: FileNamesList = [];
1614

1715
if (!pullRequest?.number) {
18-
const getCommitEndpointOptions = octokit.rest.repos.getCommit.endpoint.merge({
16+
const response = await octokit.rest.repos.getCommit({
1917
owner: context.repo.owner,
2018
repo: context.repo.repo,
2119
ref: context.sha,
2220
});
23-
24-
type ReposGetCommitResponse = GetResponseDataTypeFromEndpointMethod<typeof octokit.rest.repos.getCommit>;
25-
const response: ReposGetCommitResponse[] = await octokit.paginate(getCommitEndpointOptions);
26-
const filesArr = response.map((data) => data.files);
27-
28-
const filesChangedInCommit = filesArr.reduce((acc, val) => acc?.concat(val || []), []);
29-
30-
filenames = getFileNames(filesChangedInCommit as File[]);
21+
const filesArr = response.data.files ?? [];
22+
filenames = getFileNames(filesArr as File[]);
3123
} else {
32-
const listFilesEndpointOptions = octokit.rest.pulls.listFiles.endpoint.merge({
24+
const filesChangedInPR = await octokit.paginate(octokit.rest.pulls.listFiles, {
3325
owner: context.repo.owner,
3426
repo: context.repo.repo,
3527
pull_number: pullRequest.number,
3628
});
3729

38-
type PullsListFilesResponse = GetResponseDataTypeFromEndpointMethod<typeof octokit.rest.pulls.listFiles>;
39-
const filesChangedInPR: PullsListFilesResponse = await octokit.paginate(listFilesEndpointOptions);
40-
4130
filenames = getFileNames(filesChangedInPR as File[]);
4231
}
4332

0 commit comments

Comments
 (0)