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

Auto-merge for PR #647 via VersionBot

Browse Source 
Add a --dont-check-device-type option for `resin preload`
This commit is contained in:
resin-io-versionbot[bot] 2017-08-28 08:45:41 +00:00 committed by GitHub
commit dfcac4a532
4 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
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/).
## v6.6.0 - 2017-08-28
* Add a --dont-check-device-type option for `resin preload` #647 [Alexis Svinartchouk]
## v6.5.3 - 2017-08-24
* Remove resin-preload build filtering workaround. #645 [Alexis Svinartchouk]

7
build/actions/preload.js
View File

@ -151,6 +151,10 @@ module.exports = {
signature: 'dont-detect-flasher-type-images',
boolean: true,
description: 'Disables the flasher type images detection: treats all images as non flasher types'
}, {
signature: 'dont-check-device-type',
boolean: true,
description: 'Disables check for matching device types in image and application'
}
]),
action: function(params, options, done) {
@ -186,6 +190,9 @@ module.exports = {
slug = arg.slug, builds = arg.builds;
imageInfoSpinner.stop();
return Promise["try"](function() {
if (options['dont-check-device-type'] && !options.appId) {
expectedError('You need to specify an app id if you disable the device type check.');
}
if (options.appId) {
return preload.getApplication(resin, options.appId)["catch"](errors.ResinApplicationNotFound, expectedError);
}

7
lib/actions/preload.coffee
View File

@ -142,6 +142,11 @@ module.exports =
boolean: true
description: 'Disables the flasher type images detection: treats all images as non flasher types'
}
{
signature: 'dont-check-device-type'
boolean: true
description: 'Disables check for matching device types in image and application'
}
]
action: (params, options, done) ->
_ = require('lodash')
@ -189,6 +194,8 @@ module.exports =
imageInfoSpinner.stop()
# Use the appId given as --app or show an interactive app selection menu
Promise.try ->
if options['dont-check-device-type'] and not options.appId
expectedError('You need to specify an app id if you disable the device type check.')
if options.appId
return preload.getApplication(resin, options.appId)
.catch(errors.ResinApplicationNotFound, expectedError)

2
package.json
View File

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