remove type castings related to GitHubUtils

CatalinCighi · Mar 27, 2024 · 81e823f · 81e823f
1 parent 3d32646
commit 81e823f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/.github/actions/javascript/getArtifactInfo/getArtifactInfo.ts b/.github/actions/javascript/getArtifactInfo/getArtifactInfo.ts
@@ -1,15 +1,11 @@
 import * as core from '@actions/core';
-import type {components as OctokitComponents} from '@octokit/openapi-types/types';
-import GithubUtils from '../../../libs/GithubUtils';
-
-type OctokitArtifact = OctokitComponents['schemas']['artifact'];
+import GithubUtils from '@github/libs/GithubUtils';
 
 const run = function (): Promise<void> {
     const artifactName = core.getInput('ARTIFACT_NAME', {required: true});
 
-    // TODO: remove type casting once GithubUtils (https://github.com/Expensify/App/pull/38280) is migrated to TypeScript
     return GithubUtils.getArtifactByName(artifactName)
-        .then((artifact: OctokitArtifact) => {
+        .then((artifact) => {
             if (artifact === undefined) {
                 console.log(`No artifact found with the name ${artifactName}`);
                 core.setOutput('ARTIFACT_FOUND', false);
@@ -24,7 +20,7 @@ const run = function (): Promise<void> {
         .catch((error: Error) => {
             console.error('A problem occurred while trying to communicate with the GitHub API', error);
             core.setFailed(error);
-        }) as Promise<void>;
+        });
 };
 
 if (require.main === module) {

diff --git a/.github/actions/javascript/getArtifactInfo/index.js b/.github/actions/javascript/getArtifactInfo/index.js
@@ -11481,7 +11481,6 @@ const core = __importStar(__nccwpck_require__(2186));
 const GithubUtils_1 = __importDefault(__nccwpck_require__(9296));
 const run = function () {
     const artifactName = core.getInput('ARTIFACT_NAME', { required: true });
-    // TODO: remove type casting once GithubUtils (https://github.com/Expensify/App/pull/38280) is migrated to TypeScript
     return GithubUtils_1.default.getArtifactByName(artifactName)
         .then((artifact) => {
         if (artifact === undefined) {

diff --git a/tests/unit/markPullRequestsAsDeployedTest.ts b/tests/unit/markPullRequestsAsDeployedTest.ts
@@ -3,6 +3,7 @@
 /**
  * @jest-environment node
  */
+import type {InternalOctokit} from '../../.github/libs/GithubUtils';
 import GithubUtils from '../../.github/libs/GithubUtils';
 import GitUtils from '../../.github/libs/GitUtils';
 
@@ -129,8 +130,7 @@ beforeAll(() => {
         paginate: jest.fn().mockImplementation(<T>(objectMethod: () => Promise<ObjectMethodData<T>>) => objectMethod().then(({data}) => data)),
     };
 
-    // @ts-expect-error TODO: Remove this once GithubUtils (https://github.com/Expensify/App/issues/25382) is migrated to TypeScript.
-    GithubUtils.internalOctokit = moctokit;
+    GithubUtils.internalOctokit = moctokit as unknown as InternalOctokit;
 
     // Mock GitUtils
     GitUtils.getPullRequestsMergedBetween = jest.fn();