aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Finlay <somniac@me.com>2016-08-26 06:27:37 +0800
committerGitHub <noreply@github.com>2016-08-26 06:27:37 +0800
commita1fd2b6688093119042e773762081114c0f29ce9 (patch)
tree0967f2b850593f7bd81d24ae62b58ea030fbda76
parentca4127dd5e5324421061e7d5557cdadd32a00186 (diff)
parentbbb684309e04030dbf288f3e933222b3d27d9b54 (diff)
downloadtangerine-wallet-browser-a1fd2b6688093119042e773762081114c0f29ce9.tar
tangerine-wallet-browser-a1fd2b6688093119042e773762081114c0f29ce9.tar.gz
tangerine-wallet-browser-a1fd2b6688093119042e773762081114c0f29ce9.tar.bz2
tangerine-wallet-browser-a1fd2b6688093119042e773762081114c0f29ce9.tar.lz
tangerine-wallet-browser-a1fd2b6688093119042e773762081114c0f29ce9.tar.xz
tangerine-wallet-browser-a1fd2b6688093119042e773762081114c0f29ce9.tar.zst
tangerine-wallet-browser-a1fd2b6688093119042e773762081114c0f29ce9.zip
Merge branch 'master' into i432PersistFormState
-rw-r--r--circle.yml6
-rw-r--r--package.json2
2 files changed, 7 insertions, 1 deletions
diff --git a/circle.yml b/circle.yml
index ccb5fa120..a9dd98f0d 100644
--- a/circle.yml
+++ b/circle.yml
@@ -4,3 +4,9 @@ machine:
dependencies:
pre:
- "npm i -g testem"
+ override:
+ - sudo apt-get install libxss1 libappindicator1 libindicator7 lsb-base
+ - curl -L -o google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+ - sudo dpkg -i google-chrome.deb
+ - sudo sed -i 's|HERE/chrome\"|HERE/chrome\" --disable-setuid-sandbox|g' /opt/google/chrome/google-chrome
+ - rm google-chrome.deb
diff --git a/package.json b/package.json
index 774af2b0c..fdf6c822e 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,7 @@
"through2": "^2.0.1",
"vreme": "^3.0.2",
"web3": "^0.17.0-alpha",
- "web3-provider-engine": "^7.8.3",
+ "web3-provider-engine": "^8.0.2",
"web3-stream-provider": "^2.0.6",
"xtend": "^4.0.1"
},