Skip to content

Commit

Permalink
Merge pull request #2635 from balena-io/release-v1.5.0
Browse files Browse the repository at this point in the history
Release v1.5.0
  • Loading branch information
thundron authored Feb 21, 2019
2 parents b1ab383 + 41a7fc4 commit d70b189
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 9 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## v1.5.0 - 2019-02-16

### Misc

- Reworked flashing logic with etcher-sdk
- Upgrade to Electron v3.
- Upgrade to NPM 6.7.0
- Fix incorrect drives list on Linux
- Changed “Drive Contains Image” to “Drive Mountpoint Contains Image”
- Removed etcher-cli

## v1.4.9 - 2018-12-19

### Fixes
Expand Down
17 changes: 14 additions & 3 deletions lib/gui/modules/child-writer.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

'use strict'

const Bluebird = require('bluebird')
const _ = require('lodash')
const ipc = require('node-ipc')
const sdk = require('etcher-sdk')
Expand All @@ -37,6 +38,7 @@ ipc.config.silent = true
// process is closed, so we can kill this process as well.
ipc.config.stopRetrying = 0

const DISCONNECT_DELAY = 100
const IPC_SERVER_ID = process.env.IPC_SERVER_ID

/**
Expand Down Expand Up @@ -82,7 +84,10 @@ const terminate = (code) => {
*/
const handleError = (error) => {
ipc.of[IPC_SERVER_ID].emit('error', errors.toJSON(error))
terminate(EXIT_CODES.GENERAL_ERROR)
Bluebird.delay(DISCONNECT_DELAY)
.then(() => {
terminate(EXIT_CODES.GENERAL_ERROR)
})
}

/**
Expand Down Expand Up @@ -179,7 +184,10 @@ ipc.connectTo(IPC_SERVER_ID, () => {
return errors.toJSON(error)
})
ipc.of[IPC_SERVER_ID].emit('done', { results })
terminate(exitCode)
Bluebird.delay(DISCONNECT_DELAY)
.then(() => {
terminate(exitCode)
})
}

/**
Expand All @@ -190,7 +198,10 @@ ipc.connectTo(IPC_SERVER_ID, () => {
const onAbort = () => {
log('Abort')
ipc.of[IPC_SERVER_ID].emit('abort')
terminate(exitCode)
Bluebird.delay(DISCONNECT_DELAY)
.then(() => {
terminate(exitCode)
})
}

ipc.of[IPC_SERVER_ID].on('cancel', onAbort)
Expand Down
40 changes: 35 additions & 5 deletions npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "balena-etcher",
"private": true,
"displayName": "balenaEtcher",
"version": "1.4.9",
"version": "1.5.0",
"packageType": "local",
"updates": {
"enabled": true,
Expand Down
Binary file modified screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit d70b189

Please sign in to comment.