diff --git a/lib/installer.js b/lib/installer.js index 4f8ff94a..c97685f6 100644 --- a/lib/installer.js +++ b/lib/installer.js @@ -1,7 +1,11 @@ "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -14,7 +18,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? ( var __importStar = (this && this.__importStar) || function (mod) { if (mod && mod.__esModule) return mod; var result = {}; - if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); + if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); __setModuleDefault(result, mod); return result; }; @@ -109,9 +113,12 @@ function downloadRelease(version) { try { downloadPath = yield tc.downloadTool(downloadUrl); } - catch (error) { - core.debug(error); - throw `Failed to download version ${version}: ${error}`; + catch (err) { + if (err instanceof tc.HTTPError) { + core.debug(err.message); + throw `Failed to download version ${version}: ${err.name}, ${err.message} - ${err.httpStatusCode}`; + } + throw `Failed to download version ${version}: ${err}`; } // Extract let extPath = yield tc.extractZip(downloadPath); diff --git a/lib/main.js b/lib/main.js index bffe8531..f65e169d 100644 --- a/lib/main.js +++ b/lib/main.js @@ -1,7 +1,11 @@ "use strict"; var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { if (k2 === undefined) k2 = k; - Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); }) : (function(o, m, k, k2) { if (k2 === undefined) k2 = k; o[k2] = m[k]; @@ -14,7 +18,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? ( var __importStar = (this && this.__importStar) || function (mod) { if (mod && mod.__esModule) return mod; var result = {}; - if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); + if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); __setModuleDefault(result, mod); return result; }; @@ -39,7 +43,7 @@ function run() { yield installer.getProtoc(version, includePreReleases, repoToken); } catch (error) { - core.setFailed(error.message); + core.setFailed(`${error}`); } }); } diff --git a/package-lock.json b/package-lock.json index 490a22c7..f21e9023 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,7 +35,7 @@ "nock": "^10.0.6", "prettier": "^1.17.1", "ts-jest": "^24.0.2", - "typescript": "^3.9.10" + "typescript": "^4.9.5" } }, "node_modules/@actions/core": { @@ -11820,9 +11820,9 @@ } }, "node_modules/typescript": { - "version": "3.9.10", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz", - "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==", + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -21682,9 +21682,9 @@ } }, "typescript": { - "version": "3.9.10", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz", - "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==", + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", "dev": true }, "uc.micro": { diff --git a/package.json b/package.json index f2027ca3..e582ee9e 100644 --- a/package.json +++ b/package.json @@ -49,6 +49,6 @@ "nock": "^10.0.6", "prettier": "^1.17.1", "ts-jest": "^24.0.2", - "typescript": "^3.9.10" + "typescript": "^4.9.5" } } diff --git a/src/installer.ts b/src/installer.ts index b0515273..76863d05 100644 --- a/src/installer.ts +++ b/src/installer.ts @@ -102,9 +102,12 @@ async function downloadRelease(version: string): Promise { let downloadPath: string | null = null; try { downloadPath = await tc.downloadTool(downloadUrl); - } catch (error) { - core.debug(error); - throw `Failed to download version ${version}: ${error}`; + } catch (err) { + if (err instanceof tc.HTTPError) { + core.debug(err.message); + throw `Failed to download version ${version}: ${err.name}, ${err.message} - ${err.httpStatusCode}`; + } + throw `Failed to download version ${version}: ${err}`; } // Extract diff --git a/src/main.ts b/src/main.ts index b70341a4..08a45b8f 100644 --- a/src/main.ts +++ b/src/main.ts @@ -10,7 +10,7 @@ async function run() { let repoToken = core.getInput("repo-token"); await installer.getProtoc(version, includePreReleases, repoToken); } catch (error) { - core.setFailed(error.message); + core.setFailed(`${error}`); } }