Merge pull request #8 from gregoranders/development

Development
gregoranders · Apr 10, 2020 · b4d9493 · b4d9493
2 parents c53b794 + c7f6285
commit b4d9493
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 18 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/package.json b/package.json
@@ -61,7 +61,6 @@
     "@actions/github": "2.1.1"
   },
   "devDependencies": {
-    "@octokit/rest": "17.2.0",
     "@types/jest": "25.2.1",
     "@types/mime": "2.0.1",
     "@zeit/ncc": "0.22.1",

diff --git a/src/action.spec.ts b/src/action.spec.ts
@@ -38,10 +38,8 @@ describe("nodejs-upload-asset", () => {
     process.env.GITHUB_TOKEN = "abcd";
     uploadReleaseAssetMock.mockReturnValue({
       data: {
-        value: {
-          browser_download_url: "download_url",
-          id: 1,
-        }
+        browser_download_url: "download_url",
+        id: 1,
       },
     });
     return testSubject().then(() => {
@@ -62,10 +60,8 @@ describe("nodejs-upload-asset", () => {
     process.env.GITHUB_TOKEN = "abcd";
     uploadReleaseAssetMock.mockReturnValue({
       data: {
-        value: {
-          browser_download_url: "download_url",
-          id: 1,
-        }
+        browser_download_url: "download_url",
+        id: 1,
       },
     });
     return testSubject().then(() => {

diff --git a/src/action.ts b/src/action.ts
@@ -5,19 +5,19 @@ import * as fs from "fs";
 import { getType } from "mime";
 import { basename, resolve } from "path";
 
-import Octokit from "@actions/github/node_modules/@octokit/rest";
+import { Octokit } from "@octokit/rest";
 
-type ReposUploadReleaseAssetParams = Octokit.Octokit.ReposUploadReleaseAssetParams;
+type ReposUploadReleaseAssetParams = Octokit.ReposUploadReleaseAssetParams;
 
 const uploadAsset = async (client: GitHub, params: ReposUploadReleaseAssetParams) => {
-  core.startGroup(`Uploading asset ${params.label} to release ${params.url}`);
-  const response = await client.repos.uploadReleaseAsset(params);
-  core.info(`Release asset ${response.data.value.name} created [id: ${response.data.value.id}]`);
+  core.startGroup(`Uploading asset ${params.name} to release ${params.url}`);
+  // tslint:disable-next-line: no-any
+  const response = await client.repos.uploadReleaseAsset(params) as any;
+  core.info(`Release asset ${response.data.name} created [id: ${response.data.id}]`);
   core.endGroup();
-  return response.data.value;
+  return response.data;
 };
 
-
 const prepareHeaders = (fullPathChecked: string, mime: string) => {
   return {
     "content-length": fs.statSync(fullPathChecked).size,
@@ -26,7 +26,7 @@ const prepareHeaders = (fullPathChecked: string, mime: string) => {
 };
 
 const prepareParams = (data: Buffer, headers: { "content-length": number; "content-type": string; },
-  label: string, name: string, url: string): Octokit.Octokit.ReposUploadReleaseAssetParams => {
+  label: string, name: string, url: string): Octokit.ReposUploadReleaseAssetParams => {
   return {
     data,
     headers,