Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make .configure() configure network settings for both 1.x & 2.x #25

Merged
merged 16 commits into from
Nov 28, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).

## v4.0.1 - 2017-11-21

## v4.1.0 - 2017-11-28

* Upgrade to reconfix 0.0.4 to fix windows support [Tim Perry]
* Make .configure() configure network settings for both 1.x & 2.x [Tim Perry]
* Upgrade to resin-image-fs@4, adding ext support [Tim Perry]

- Move from travis to circle and set up npm autopublishing

## v4.0.0 - 2017-10-13
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Documentation
<a name="module_init.configure"></a>

### init.configure(image, device, config, [options]) ⇒ <code>Promise.&lt;EventEmitter&gt;</code>
This function injects `config.json` into the device.
This function injects `config.json` and network settings into the device.

**Kind**: static method of <code>[init](#module_init)</code>
**Summary**: Configure an image with an application
Expand Down
3 changes: 1 addition & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ init:
# what combinations to test
environment:
matrix:
- nodejs_version: 8
- nodejs_version: 6
- nodejs_version: 4

install:
- ps: Install-Product node $env:nodejs_version x64
Expand All @@ -21,5 +21,4 @@ build: off
test_script:
- node --version
- npm --version
- ps: npm test
- cmd: npm test
35 changes: 29 additions & 6 deletions build/init.js

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

278 changes: 278 additions & 0 deletions build/network.js

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

Loading