Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Dutchman committed Apr 15, 2019
2 parents 24c942d + 3d6e536 commit 24c60f9
Show file tree
Hide file tree
Showing 5 changed files with 726 additions and 722 deletions.
11 changes: 4 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,28 @@ os:
- linux
- osx
- windows

language: node_js
node_js:
- '6'
- '8'
- '10'

env:
- CXX=g++-4.8
- CXX=g++-4.9
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-4.9

before_install:
- 'if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then CC=gcc-4.9; fi'
- 'if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then CC=g++-4.9; fi'
before_script:
- export NPMVERSION=$(echo "$($(which npm) -v)"|cut -c1)
- 'if [[ $NPMVERSION == 5 ]]; then npm install -g npm; fi'
- npm -v
- npm install winston@2.3.1
- npm install winston@3.2.1
- 'npm install https://github.com/ioBroker/ioBroker.js-controller/tarball/master --production'
script:
- npm run test:package
- npm run test:iobroker
- 'npm run test:package'
- 'npm run test:iobroker'
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
![alt text](https://raw.githubusercontent.com/DutchmanNL/ioBroker.opentherm/master/admin/opentherm_large.png)

# Opentherm integration ioBroker

![alt text](https://travis-ci.org/iobroker-community-adapters/ioBroker.opentherm.svg?branch=master)
![Number of Installations](http://iobroker.live/badges/opentherm-installed.svg) ![Number of Installations](http://iobroker.live/badges/opentherm-stable.svg) [![NPM version](http://img.shields.io/npm/v/iobroker.opentherm.svg)](https://www.npmjs.com/package/iobroker.opentherm)
[![Downloads](https://img.shields.io/npm/dm/iobroker.opentherm.svg)](https://www.npmjs.com/package/iobroker.opentherm)
[![Greenkeeper badge](https://badges.greenkeeper.io/iobroker-community-adapters/ioBroker.opentherm.svg)](https://greenkeeper.io/)

This adapter integrates all features of the opentherm gateway into ioBroker.
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
},
"bundleDependencies": false,
"dependencies": {
"@iobroker/adapter-core": "^1.0.1",
"@iobroker/adapter-core": "^1.0.3",
"@types/request": "^2.48.1",
"gulp": "^4.0.0",
"axios": "^0.18.0",
Expand All @@ -49,7 +49,7 @@
"chai": "^4.2.0",
"chai-as-promised": "^7.1.1",
"eslint": "^5.9.0",
"mocha": "^6.0.0",
"mocha": "^6.0.2",
"proxyquire": "^2.1.0",
"sinon": "^7.1.1",
"sinon-chai": "^3.3.0"
Expand Down Expand Up @@ -77,4 +77,4 @@
"test:package": "mocha test/testPackageFiles.js --exit"
},
"version": "0.1.9"
}
}
Loading

0 comments on commit 24c60f9

Please sign in to comment.