ExternalVendorCode/balena-cli
1
0
Fork 0
mirror of https://github.com/balena-io/balena-cli.git synced 2024-12-25 08:21:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1050 from balena-io/node6-types

Browse Source 
Fix deploy action on node 6
This commit is contained in:
Alexis Svinartchouk 2018-12-14 11:37:07 +01:00 committed by GitHub
commit a66aec6965
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/utils/device/deploy.ts
View File

@ -196,7 +196,7 @@ function assignOutputHandlers(buildTasks: BuildTask[], logger: Logger) {
} else { } else {
task.streamHook = stream => { task.streamHook = stream => {
stream.on('data', (buf: Buffer) => { stream.on('data', (buf: Buffer) => {
const str = buf.toString().trimRight(); const str = _.trimEnd(buf.toString());
if (str !== '') { if (str !== '') {
displayBuildLog( displayBuildLog(
{ serviceName: task.serviceName, message: str }, { serviceName: task.serviceName, message: str },

4
lib/utils/patterns.ts
View File

@ -283,5 +283,7 @@ export function exitWithExpectedError(message: string | Error): never {
} }
printErrorMessage(message); printErrorMessage(message);
return process.exit(1); process.exit(1);
// The following throw is to make tsc happy about the `never` return type.
throw new Error('exit');
} }

2
package.json
View File

@ -71,7 +71,7 @@
"@types/is-root": "1.0.0", "@types/is-root": "1.0.0",
"@types/lodash": "4.14.103", "@types/lodash": "4.14.103",
"@types/mkdirp": "0.5.2", "@types/mkdirp": "0.5.2",
"@types/node": "10.5.2", "@types/node": "6.14.2",
"@types/prettyjson": "0.0.28", "@types/prettyjson": "0.0.28",
"@types/raven": "2.5.1", "@types/raven": "2.5.1",
"catch-uncommitted": "^1.0.0", "catch-uncommitted": "^1.0.0",