Auto-merge for PR #834 via VersionBot

Fix crash when an app is not specified for build command
This commit is contained in:
resin-io-versionbot[bot] 2018-03-28 12:01:10 +00:00 committed by GitHub
commit 906cfe9268
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions

View File

@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file
automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
This project adheres to [Semantic Versioning](http://semver.org/).
## v7.1.5 - 2018-03-27
* Fix crash when an app is not specified for build command #834 [Akis Kesoglou]
## v7.1.4 - 2018-03-26
* Upgrade resin-sync to pull in the fix for #824 #832 [Tim Perry]

View File

@ -7,7 +7,7 @@ compose = require('../utils/compose')
###
Opts must be an object with the following keys:
app: the app this build is for
app: the app this build is for (optional)
arch: the architecture to build for
deviceType: the device type to build for
buildEmulated
@ -20,7 +20,8 @@ buildProject = (docker, logger, composeOpts, opts) ->
composeOpts.projectName
)
.then (project) ->
if project.descriptors.length > 1 and not opts.app.application_type?[0]?.supports_multicontainer
appType = opts.app?.application_type?[0]
if appType? and project.descriptors.length > 1 and not appType.supports_multicontainer
logger.logWarn(
'Target application does not support multiple containers.\n' +
'Continuing with build, but you will not be able to deploy.'

View File

@ -1,6 +1,6 @@
{
"name": "resin-cli",
"version": "7.1.4",
"version": "7.1.5",
"description": "The official resin.io CLI tool",
"main": "./build/actions/index.js",
"homepage": "https://github.com/resin-io/resin-cli",