Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,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;
};
Expand Down Expand Up @@ -96,7 +96,9 @@ function downloadRelease(version) {
downloadPath = yield tc.downloadTool(downloadUrl, undefined, token);
}
catch (error) {
core.debug(error);
if (typeof error === "string" || error instanceof Error) {
core.debug(error.toString());
}
throw `Failed to download version ${version}: ${error}`;
}
// Extract
Expand Down Expand Up @@ -243,7 +245,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;
};
Expand Down Expand Up @@ -302,13 +304,18 @@ function run() {
}
const options = {
env: {
ARDUINO_LINT_OFFICIAL: official,
ARDUINO_LINT_OFFICIAL: official, // The official mode is set via an environment variable.
},
};
yield exec.exec(toolPath, execArgs, options);
}
catch (error) {
core.setFailed(error.message);
if (error instanceof Error) {
core.setFailed(error.message);
}
else {
throw error;
}
}
});
}
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@
"nock": "^10.0.6",
"prettier": "^2.5.1",
"ts-jest": "^26.4.4",
"typescript": "^3.9.7"
"typescript": "^4.5.4"
}
}
4 changes: 3 additions & 1 deletion src/installer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,9 @@ async function downloadRelease(version: string): Promise<string> {
const token: string = core.getInput("token", { required: true });
downloadPath = await tc.downloadTool(downloadUrl, undefined, token);
} catch (error) {
core.debug(error);
if (typeof error === "string" || error instanceof Error) {
core.debug(error.toString());
}
throw `Failed to download version ${version}: ${error}`;
}

Expand Down
6 changes: 5 additions & 1 deletion src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,11 @@ async function run() {

await exec.exec(toolPath, execArgs, options);
} catch (error) {
core.setFailed(error.message);
if (error instanceof Error) {
core.setFailed(error.message);
} else {
throw error;
}
}
}

Expand Down