Skip to content

Commit ca245b9

Browse files
authored
Merge pull request #23 from arduino/dependabot/npm_and_yarn/typescript-4.5.4
Bump typescript from 3.9.7 to 4.5.4
2 parents 809874c + 218fa3c commit ca245b9

File tree

5 files changed

+24
-11
lines changed

5 files changed

+24
-11
lines changed

dist/index.js

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
2222
var __importStar = (this && this.__importStar) || function (mod) {
2323
if (mod && mod.__esModule) return mod;
2424
var result = {};
25-
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
25+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
2626
__setModuleDefault(result, mod);
2727
return result;
2828
};
@@ -96,7 +96,9 @@ function downloadRelease(version) {
9696
downloadPath = yield tc.downloadTool(downloadUrl, undefined, token);
9797
}
9898
catch (error) {
99-
core.debug(error);
99+
if (typeof error === "string" || error instanceof Error) {
100+
core.debug(error.toString());
101+
}
100102
throw `Failed to download version ${version}: ${error}`;
101103
}
102104
// Extract
@@ -243,7 +245,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
243245
var __importStar = (this && this.__importStar) || function (mod) {
244246
if (mod && mod.__esModule) return mod;
245247
var result = {};
246-
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
248+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
247249
__setModuleDefault(result, mod);
248250
return result;
249251
};
@@ -302,13 +304,18 @@ function run() {
302304
}
303305
const options = {
304306
env: {
305-
ARDUINO_LINT_OFFICIAL: official,
307+
ARDUINO_LINT_OFFICIAL: official, // The official mode is set via an environment variable.
306308
},
307309
};
308310
yield exec.exec(toolPath, execArgs, options);
309311
}
310312
catch (error) {
311-
core.setFailed(error.message);
313+
if (error instanceof Error) {
314+
core.setFailed(error.message);
315+
}
316+
else {
317+
throw error;
318+
}
312319
}
313320
});
314321
}

package-lock.json

Lines changed: 3 additions & 3 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
@@ -39,6 +39,6 @@
3939
"nock": "^10.0.6",
4040
"prettier": "^2.5.1",
4141
"ts-jest": "^26.4.4",
42-
"typescript": "^3.9.7"
42+
"typescript": "^4.5.4"
4343
}
4444
}

src/installer.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@ async function downloadRelease(version: string): Promise<string> {
6767
const token: string = core.getInput("token", { required: true });
6868
downloadPath = await tc.downloadTool(downloadUrl, undefined, token);
6969
} catch (error) {
70-
core.debug(error);
70+
if (typeof error === "string" || error instanceof Error) {
71+
core.debug(error.toString());
72+
}
7173
throw `Failed to download version ${version}: ${error}`;
7274
}
7375

src/main.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,11 @@ async function run() {
5858

5959
await exec.exec(toolPath, execArgs, options);
6060
} catch (error) {
61-
core.setFailed(error.message);
61+
if (error instanceof Error) {
62+
core.setFailed(error.message);
63+
} else {
64+
throw error;
65+
}
6266
}
6367
}
6468

0 commit comments

Comments
 (0)