From 18438a9ffd3b632571fed9c3ef6dc74fc1d27b7f Mon Sep 17 00:00:00 2001
From: Avaer Kazmer
Date: Wed, 7 Aug 2019 15:19:18 -0400
Subject: [PATCH 1/3] Bump appveyor node version to 12.8.0
---
appveyor.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/appveyor.yml b/appveyor.yml
index 8708b3665c..db8afdedb3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,7 +4,7 @@ version: 0.0.{build}
image:
Visual Studio 2017
environment:
- nodejs_version: "11"
+ nodejs_version: "12"
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
APPVEYOR_RDP_PASSWORD:
secure: Fd5AowLF+Z1qAk5K/W6Avg==
@@ -27,10 +27,10 @@ test_script:
after_test:
- ps: |
- wget "https://nodejs.org/dist/v12.2.0/node-v12.2.0-win-x64.zip" -OutFile node.zip
+ wget "https://nodejs.org/dist/v12.8.0/node-v12.8.0-win-x64.zip" -OutFile node.zip
7z x node.zip
rm node.zip
- mv node-v12.2.0-win-x64 node
+ mv node-v12.8.0-win-x64 node
$env:Path = "$pwd\node;$env:Path";
.\node\npm install --no-optional
$env:TEST_ENV = 'ci'
From 5b2f43dc7e6e40a8ed50d9114348d69479f856b9 Mon Sep 17 00:00:00 2001
From: Avaer Kazmer
Date: Wed, 7 Aug 2019 15:19:32 -0400
Subject: [PATCH 2/3] Bump travis node version to 12.8.0
---
.travis.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index ba5ac20040..4d616cae3c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
language: node_js
node_js:
-- '11'
+- '12'
env:
matrix:
secure: IKkxnHrFU46DF5bs1q/bldg2sAbRWAoIqHuv4ddzAgv+0Oxbg9oD8mC9DmJ77wglMt7ErLKmHxG4qImGgHTZWPTgW3oSaFkIfT32YdsLh/6tewIZmjsffjBse3yP2hpTAx2qMeCBeRTuxTqQqQ8xMuZK2i08YFnYEMJ8FSd9pJnu7FUCZ1s8sYnwHp5YctGdMLkWNVkEVyI9dAHSPsBYyC1aSEeKUOmlqUc07kJVVknG+EOX95QqGtnRIB274+Kdj64g9dX0447sRWzDM+3gK4TXKxaOqdp/YCgWtILa33u1RBwxmv4CEseRYUsr9HSHfZMaY0EPlFqSXDZD0emNVUgttnD+KyIE1Mo3pUAcc+Gkr4TePTmi+EieBw/Re5Nv3ChEBpOYL9a6GFb+MKMDzLhU6PaFQU0SaaVYkFhhpRvCr7O1Sr4Tz+814A8x32ZCEx/ER37CjB5UN0HsHgPAS4T/jNE1QC7gSX6pNBu5JQRevruWE/gZI20J6EqXR26hPhGInf175Ho4W3+GZ7Cur4sdgcXevm1mt+ZcMQEqIs0NI1TZDxfUEa3smp14fbo/ehtasTNPWwGx4hw2dgtT6/cUBzWECHExydt/e5hw41IlYKW8VW0/kC9/l+n7A/lVBbhGfV2XMXdYLcvpySAihLVou3G/rQeFGmA80Ag5vp0=
@@ -50,13 +50,13 @@ matrix:
- os: osx
osx_image: xcode10.1
node_js:
- - "12.2.0"
+ - "12.8.0"
install:
- npm install -g appdmg-exokit
- - curl "https://nodejs.org/dist/v12.2.0/node-v12.2.0-darwin-x64.tar.gz" >node.tar.gz
+ - curl "https://nodejs.org/dist/v12.8.0/node-v12.8.0-darwin-x64.tar.gz" >node.tar.gz
- tar -zxf node.tar.gz
- rm node.tar.gz
- - mv node-v12.2.0-darwin-x64 node
+ - mv node-v12.8.0-darwin-x64 node
- export PATH="$(pwd)/node/bin:$PATH"
- unset NVM_NODEJS_ORG_MIRROR
- "./node/bin/npm install --no-optional"
From 0d2633d3a4fbe122b3ea14b92a166cdf974a7220 Mon Sep 17 00:00:00 2001
From: Avaer Kazmer
Date: Wed, 7 Aug 2019 15:52:28 -0400
Subject: [PATCH 3/3] Ensure optional npm dependencies are installed
---
.travis.yml | 2 +-
appveyor.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 4d616cae3c..d9482da58b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,7 +59,7 @@ matrix:
- mv node-v12.8.0-darwin-x64 node
- export PATH="$(pwd)/node/bin:$PATH"
- unset NVM_NODEJS_ORG_MIRROR
- - "./node/bin/npm install --no-optional"
+ - "./node/bin/npm install"
- export TEST_ENV=ci
- "./node/bin/npm run test"
- install_name_tool -change '@rpath/OpenVR.framework/Versions/A/OpenVR' '@loader_path/../../node_modules/native-openvr-deps/bin/osx64/OpenVR.framework/Versions/A/OpenVR'
diff --git a/appveyor.yml b/appveyor.yml
index db8afdedb3..38653ff3a8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -32,7 +32,7 @@ after_test:
rm node.zip
mv node-v12.8.0-win-x64 node
$env:Path = "$pwd\node;$env:Path";
- .\node\npm install --no-optional
+ .\node\npm install
$env:TEST_ENV = 'ci'
.\node\npm run test
# bash scripts/testRun.sh