Skip to content

Commit 3542b85

Browse files
committed
Fix pre-existing @octokit type mismatch for ncc builds
Add @ts-ignore for createAppAuth calls where @octokit/request and @octokit/types have incompatible retryCount types.
1 parent cd612ca commit 3542b85

File tree

6 files changed

+21809
-11654
lines changed

6 files changed

+21809
-11654
lines changed

lambdas/functions/control-plane/src/github/auth.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ async function createAuth(installationId: number | undefined, ghesApiUrl: string
135135

136136
logger.debug(`GHES API URL: ${ghesApiUrl}`);
137137
if (ghesApiUrl) {
138+
// @ts-ignore - Type mismatch between @octokit/request and @octokit/types versions
138139
authOptions.request = request.defaults({
139140
baseUrl: ghesApiUrl,
140141
});

lambdas/functions/termination-watcher/src/deregister.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ async function createAuthenticatedClient(ghesApiUrl: string): Promise<Octokit> {
5555
if (ghesApiUrl) {
5656
authOptions.request = request.defaults({ baseUrl: ghesApiUrl });
5757
}
58+
// @ts-ignore - Type mismatch between @octokit/request and @octokit/auth-app versions
5859
const auth = createAppAuth(authOptions);
5960
const appAuth = await auth({ type: 'app' });
6061
return createOctokitInstance(appAuth.token, ghesApiUrl);
@@ -101,6 +102,7 @@ async function createInstallationClient(
101102
if (ghesApiUrl) {
102103
authOptions.request = request.defaults({ baseUrl: ghesApiUrl });
103104
}
105+
// @ts-ignore - Type mismatch between @octokit/request and @octokit/auth-app versions
104106
const auth = createAppAuth(authOptions);
105107
const installationAuth = await auth({ type: 'installation' });
106108
return createOctokitInstance(installationAuth.token, ghesApiUrl);

0 commit comments

Comments
 (0)