Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
#!/bin/sh
bun generate && bun lint && bun format && bun package && git add .
Binary file modified bun.lockb
Binary file not shown.
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"@actions/github": "6.0.1",
"@adobe/node-fetch-retry": "2.2.0",
"@octokit/graphql-schema": "15.26.0",
"@octokit/rest": "21.1.1",
"axios": "1.9.0",
"bluebird": "3.7.2",
"codeowners-utils": "1.0.2",
Expand Down Expand Up @@ -59,7 +58,7 @@
"generate": "bun scripts/generate-helper-inputs.ts",
"lint": "eslint --quiet --fix ./**/*.ts src/**/*.ts test/**/*.ts",
"package": "ncc build --source-map --license licenses.txt",
"prepare": "husky install",
"prepare": "husky",
"setup": "./scripts/dev-setup.sh",
"test": "bun jest"
}
Expand Down
3 changes: 2 additions & 1 deletion src/types/github.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

import { RestEndpointMethodTypes } from '@octokit/rest';
import { RestEndpointMethodTypes } from '@octokit/plugin-rest-endpoint-methods/dist-types';
import { octokit } from '../octokit';

export type PipelineState = RestEndpointMethodTypes['repos']['createCommitStatus']['parameters']['state'];
Expand All @@ -31,6 +31,7 @@ export type ProjectListResponse = RestEndpointMethodTypes['projects']['listForRe
export type ColumnListResponse = RestEndpointMethodTypes['projects']['listColumns']['response'];
export type ChecksUpdateConclusion = RestEndpointMethodTypes['checks']['update']['parameters']['conclusion'];
export type MembersInOrg = RestEndpointMethodTypes['teams']['listMembersInOrg']['response']['data'];
export type MembersInOrgParams = RestEndpointMethodTypes['teams']['listMembersInOrg']['parameters'];

export type GithubError = {
status: number;
Expand Down
5 changes: 2 additions & 3 deletions test/utils/paginate-members-in-org.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,14 @@ limitations under the License.
*/

import { paginateMembersInOrg } from '../../src/utils/paginate-members-in-org';
import { MembersInOrg } from '../../src/types/github';
import { RestEndpointMethodTypes } from '@octokit/rest';
import { MembersInOrg, MembersInOrgParams } from '../../src/types/github';

jest.mock('@actions/github', () => ({
context: { repo: { repo: 'repo', owner: 'owner' } },
getOctokit: jest.fn(() => ({
rest: {
teams: {
listMembersInOrg: jest.fn(async (args: RestEndpointMethodTypes['teams']['listMembersInOrg']['parameters']) => {
listMembersInOrg: jest.fn(async (args: MembersInOrgParams) => {
let teamMembers: MembersInOrg = [];
switch (args.team_slug) {
case 'empty-team':
Expand Down