Auto-merge for PR #870 via VersionBot

Update resin-image-fs to stop non-config commands failing in node 10
This commit is contained in:
resin-io-versionbot[bot] 2018-04-30 09:54:09 +00:00 committed by GitHub
commit 90d7316b4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 12 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.3.6 - 2018-04-30
* Update resin-image-fs to stop non-config commands failing in node 10 #870 [Tim Perry]
## v7.3.5 - 2018-04-18
* Don't show Docker container status from devices, as it can be wrong #858 [Tim Perry]

View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
###
BOOT_PARTITION = { primary: 1 }
BOOT_PARTITION = 1
CONNECTIONS_FOLDER = '/system-connections'
getConfigurationSchema = (connnectionFileName = 'resin-wifi') ->
@ -51,12 +51,14 @@ getConfigurationSchema = (connnectionFileName = 'resin-wifi') ->
type: 'ini'
location:
path: CONNECTIONS_FOLDER.slice(1)
partition: BOOT_PARTITION
# Reconfix still uses the older resin-image-fs, so still needs an
# object-based partition definition.
partition: { primary: BOOT_PARTITION }
config_json:
type: 'json'
location:
path: 'config.json'
partition: BOOT_PARTITION
partition: { primary: BOOT_PARTITION }
inquirerOptions = (data) -> [
{

View File

@ -26,7 +26,6 @@ import ResinSdk = require('resin-sdk');
import { execute } from 'president';
import { InitializeEmitter, OperationState } from 'resin-device-init';
const extractStreamAsync = Promise.promisify(rindle.extract);
const waitStreamAsync = Promise.promisify(rindle.wait);
const presidentExecuteAsync = Promise.promisify(execute);
@ -82,14 +81,11 @@ export function getManifest(
// partition, but fallback to the API if
// we encounter any errors along the way.
return imagefs
.read({
.readFile({
image,
partition: {
primary: 1,
},
partition: 1,
path: '/device-type.json',
})
.then(extractStreamAsync)
.then(JSON.parse)
.catch(() => resin.models.device.getManifestBySlug(deviceType));
}

View File

@ -1,6 +1,6 @@
{
"name": "resin-cli",
"version": "7.3.5",
"version": "7.3.6",
"description": "The official resin.io CLI tool",
"main": "./build/actions/index.js",
"homepage": "https://github.com/resin-io/resin-cli",
@ -141,7 +141,7 @@
"resin-device-init": "^4.0.0",
"resin-docker-build": "^0.6.2",
"resin-doodles": "0.0.1",
"resin-image-fs": "^2.3.0",
"resin-image-fs": "^5.0.2",
"resin-image-manager": "^5.0.0",
"resin-multibuild": "^0.5.1",
"resin-preload": "^6.2.0",

View File

@ -1,5 +1,5 @@
declare module 'resin-image-fs' {
import Promise = require('bluebird');
export function read(options: {}): Promise<NodeJS.ReadableStream>;
export function readFile(options: {}): Promise<string>;
}