Skip to content

Commit

Permalink
Merge branch 'release/v2.5' of https://github.com/NordicSemiconductor…
Browse files Browse the repository at this point in the history
…/pc-ble-driver-js into release/v2.5
  • Loading branch information
chunfantasy committed Feb 26, 2019
2 parents 063ae9d + 172a973 commit cf9b962
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ before_install:
script:
- npm install
- npm run dev
- npm run package-prebuilt
- echo tag=$TRAVIS_TAG pullrequest=$TRAVIS_PULL_REQUEST
- |
Expand All @@ -120,7 +119,7 @@ script:
notifications:
webhooks:
urls:
- https://wayland_jenkins:11abca8370e8bd07ce599ad14fde0916f3@yj24xki8lrdhf3wl.v1.p.beameio.net/view/pc-ble-driver-js/job/pc-ble-driver-js/buildWithParameters?BRANCH=v2.5.0
- https://wayland_jenkins:11abca8370e8bd07ce599ad14fde0916f3@yj24xki8lrdhf3wl.v1.p.beameio.net/view/pc-ble-driver-js/job/pc-ble-driver-js/build
on_success: always # default: always
on_failure: never # default: always
on_start: never # default: never
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"publish-prebuilt": "node-pre-gyp-github publish",
"publish-all-prebuilt": "node scripts/publish-all-prebuilt.js",
"fetch-prebuilt": "node scripts/pre-gyp-fetch-draft.js",
"dev": "node-pre-gyp install --fallback-to-build=false || node build.js",
"install": "npm run fetch-prebuilt || node-pre-gyp install --fallback-to-build=false || node build.js",
"test": "jest --config config/jest-unit.json",
"docs": "jsdoc api -t node_modules/minami -R README.md -d docs -c .jsdoc.json"
},
Expand Down
6 changes: 3 additions & 3 deletions scripts/pre-gyp-fetch-draft.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ const path = require('path');
const pkgJson = require('../package.json');
const mkdirp = require('mkdirp');

// if (!process.env.ENABLE_DRAFT_TEST) {
// process.exit(1);
// }
if (!process.env.ENABLE_DRAFT_TEST) {
process.exit(1);
}

const ghToken = process.env.NODE_PRE_GYP_GITHUB_TOKEN;

Expand Down

0 comments on commit cf9b962

Please sign in to comment.