Merge pull request #233 from NordicSemiconductor/release-2.6.2

Release 2.6.2
NordicSemiconductor · Oct 31, 2019 · 9986840 · 9986840
2 parents a3bb7f5 + 8f367a4
commit 9986840
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 15 deletions.
diff --git a/azure-node.yml b/azure-node.yml
@@ -35,7 +35,28 @@ steps:
     npm_config_runtime: '${{ parameters.npmConfigRuntime }}',
     npm_config_target: '${{ parameters.npmConfigTarget }}',
   }
-  displayName: 'Build'
+  condition: not(contains(variables['imageName'], 'win'))
+  displayName: 'Build on Linux/macOS'
+
+- script: |
+    set VCPKG_ROOT=$(Agent.HomeDirectory)\vcpkg
+    npm install --build-from-source
+  env: {
+    npm_config_runtime: '${{ parameters.npmConfigRuntime }}',
+    npm_config_target: '${{ parameters.npmConfigTarget }}',
+  }
+  condition: contains(variables['imageName'], 'win')
+  displayName: 'Build on Windows'
+
+- script: |
+    set VCPKG_ROOT=$(Agent.HomeDirectory)\vcpkg
+    npm run package-prebuilt --verbose
+  env: {
+    npm_config_runtime: '${{ parameters.npmConfigRuntime }}',
+    npm_config_target: '${{ parameters.npmConfigTarget }}',
+  }
+  condition: contains(variables['imageName'], 'win')
+  displayName: 'Pack on Windows'
 
 - script: |
     npm test

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -37,15 +37,13 @@ jobs:
     condition: contains(variables['imageName'], 'win')
     displayName: '[Windows] Install toolchain'
   - bash: |
-      export VCPKG_ROOT=$(Agent.HomeDirectory)/vcpkg
       export PATH=$VCPKG_ROOT:$PATH
       git clone https://github.com/NordicPlayground/vcpkg.git $VCPKG_ROOT
       $VCPKG_ROOT/bootstrap-vcpkg.sh
       vcpkg install nrf-ble-driver
     condition: contains(variables['imageName'], 'ubuntu')
     displayName: '[Linux] Install nrf-ble-driver'
   - bash: |
-      export VCPKG_ROOT=$(Agent.HomeDirectory)/vcpkg
       export PATH=$VCPKG_ROOT:$PATH
       git clone https://github.com/NordicPlayground/vcpkg.git $VCPKG_ROOT
       # Vcpkg bootstap does not work with Apple Clang and it
@@ -59,7 +57,12 @@ jobs:
       set VCPKG_ROOT=$(Agent.HomeDirectory)\vcpkg
       set PATH=%VCPKG_ROOT%;%PATH%
       git clone https://github.com/NordicPlayground/vcpkg.git %VCPKG_ROOT%
-      %VCPKG_ROOT%\vcpkg\bootstrap-vcpkg.bat
+      %VCPKG_ROOT%\bootstrap-vcpkg.bat
+    condition: contains(variables['imageName'], 'win')
+    displayName: '[Windows] Install vcpkg'
+  - script: |
+      set VCPKG_ROOT=$(Agent.HomeDirectory)\vcpkg
+      set PATH=%VCPKG_ROOT%;%PATH%
       vcpkg install nrf-ble-driver:$(driverArch)-windows
     condition: contains(variables['imageName'], 'win')
     displayName: '[Windows] Install nrf-ble-driver'

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pc-ble-driver-js",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "description": "Javascript bindings for pc-ble-driver",
   "main": "index.js",
   "scripts": {
@@ -48,16 +48,12 @@
     "cmake-js": "5.1.1",
     "crc": "^3.8.0",
     "jszip": "^3.2.2",
-    "mkdirp": "^0.5.1",
     "nan": "^2.12.1",
     "node-pre-gyp": "^0.13.0",
-    "nrf-device-setup": "^0.5.1",
-    "tar": "^4.4.10",
     "underscore": "^1.9.1"
   },
   "devDependencies": {
     "babel-preset-env": "^1.7.0",
-    "chai": "4.2.0",
     "debug": "4.1.0",
     "eslint": "^6.0.1",
     "eslint-config-airbnb": "^17.1.1",
@@ -71,14 +67,9 @@
     "jscs": "^3.0.7",
     "jsdoc": "^3.6.2",
     "jshint": "^2.10.2",
-    "keypress": "0.2.1",
     "minami": "^1.2.3",
-    "mocha": "^6.1.4",
     "node-pre-gyp-github": "1.4.3",
-    "nrf-device-lister": "^2.2.1",
-    "proxyquire": "^2.1.0",
-    "sinon": "^7.3.2",
-    "yargs": "^13.2.4"
+    "nrf-device-setup": "^0.6.0"
   },
   "files": [
     "api/",