Skip to content

Commit ce629e7

Browse files
Merge pull request #72 from arduino/update-ts
Update to typescript 4.9.5
2 parents 4b35781 + ef6c10d commit ce629e7

File tree

6 files changed

+34
-20
lines changed

6 files changed

+34
-20
lines changed

lib/installer.js

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
"use strict";
22
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
33
if (k2 === undefined) k2 = k;
4-
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
4+
var desc = Object.getOwnPropertyDescriptor(m, k);
5+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6+
desc = { enumerable: true, get: function() { return m[k]; } };
7+
}
8+
Object.defineProperty(o, k2, desc);
59
}) : (function(o, m, k, k2) {
610
if (k2 === undefined) k2 = k;
711
o[k2] = m[k];
@@ -14,7 +18,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
1418
var __importStar = (this && this.__importStar) || function (mod) {
1519
if (mod && mod.__esModule) return mod;
1620
var result = {};
17-
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
21+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
1822
__setModuleDefault(result, mod);
1923
return result;
2024
};
@@ -109,9 +113,12 @@ function downloadRelease(version) {
109113
try {
110114
downloadPath = yield tc.downloadTool(downloadUrl);
111115
}
112-
catch (error) {
113-
core.debug(error);
114-
throw `Failed to download version ${version}: ${error}`;
116+
catch (err) {
117+
if (err instanceof tc.HTTPError) {
118+
core.debug(err.message);
119+
throw `Failed to download version ${version}: ${err.name}, ${err.message} - ${err.httpStatusCode}`;
120+
}
121+
throw `Failed to download version ${version}: ${err}`;
115122
}
116123
// Extract
117124
let extPath = yield tc.extractZip(downloadPath);

lib/main.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
"use strict";
22
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
33
if (k2 === undefined) k2 = k;
4-
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
4+
var desc = Object.getOwnPropertyDescriptor(m, k);
5+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6+
desc = { enumerable: true, get: function() { return m[k]; } };
7+
}
8+
Object.defineProperty(o, k2, desc);
59
}) : (function(o, m, k, k2) {
610
if (k2 === undefined) k2 = k;
711
o[k2] = m[k];
@@ -14,7 +18,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
1418
var __importStar = (this && this.__importStar) || function (mod) {
1519
if (mod && mod.__esModule) return mod;
1620
var result = {};
17-
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
21+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
1822
__setModuleDefault(result, mod);
1923
return result;
2024
};
@@ -39,7 +43,7 @@ function run() {
3943
yield installer.getProtoc(version, includePreReleases, repoToken);
4044
}
4145
catch (error) {
42-
core.setFailed(error.message);
46+
core.setFailed(`${error}`);
4347
}
4448
});
4549
}

package-lock.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,6 @@
4949
"nock": "^10.0.6",
5050
"prettier": "^1.17.1",
5151
"ts-jest": "^24.0.2",
52-
"typescript": "^3.9.10"
52+
"typescript": "^4.9.5"
5353
}
5454
}

src/installer.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,12 @@ async function downloadRelease(version: string): Promise<string> {
102102
let downloadPath: string | null = null;
103103
try {
104104
downloadPath = await tc.downloadTool(downloadUrl);
105-
} catch (error) {
106-
core.debug(error);
107-
throw `Failed to download version ${version}: ${error}`;
105+
} catch (err) {
106+
if (err instanceof tc.HTTPError) {
107+
core.debug(err.message);
108+
throw `Failed to download version ${version}: ${err.name}, ${err.message} - ${err.httpStatusCode}`;
109+
}
110+
throw `Failed to download version ${version}: ${err}`;
108111
}
109112

110113
// Extract

src/main.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ async function run() {
1010
let repoToken = core.getInput("repo-token");
1111
await installer.getProtoc(version, includePreReleases, repoToken);
1212
} catch (error) {
13-
core.setFailed(error.message);
13+
core.setFailed(`${error}`);
1414
}
1515
}
1616

0 commit comments

Comments
 (0)