Skip to content

Commit

Permalink
Auto-merge for PR #834 via VersionBot
Browse files Browse the repository at this point in the history
Fix crash when an app is not specified for build command
  • Loading branch information
resin-io-versionbot[bot] committed Mar 28, 2018
2 parents 2bbbbf6 + 3c8054f commit 906cfe9
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
5 changes: 3 additions & 2 deletions lib/actions/build.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.'
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down

0 comments on commit 906cfe9

Please sign in to comment.