Skip to content

Commit

Permalink
Merge pull request #12 from Apollon77/master
Browse files Browse the repository at this point in the history
Core Files/Testing Update and introduce adapter-core
  • Loading branch information
DutchmanNL authored Mar 7, 2019
2 parents 80c94f1 + 9e776cc commit a1ddc86
Show file tree
Hide file tree
Showing 4 changed files with 723 additions and 721 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'
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",
"request": "^2.88.0",
"serialport": "^7.1.0"
Expand All @@ -47,7 +47,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 @@ -75,4 +75,4 @@
"test:package": "mocha test/testPackageFiles.js --exit"
},
"version": "0.1.9"
}
}
Loading

0 comments on commit a1ddc86

Please sign in to comment.