Skip to content

Commit f6449ae

Browse files
authored
Merge pull request #124 from jpogran/travis-foo
Fix travis testing
2 parents 2703e8e + 6223574 commit f6449ae

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

.travis.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
1-
language: node_js
2-
node_js:
3-
- "node"
4-
5-
environment:
6-
ELECTRON_RUN_AS_NODE: 1
7-
VSCODE_BUILD_VERBOSE: true
8-
91
sudo: false
2+
language: cpp
103

114
os:
125
- linux
136

7+
environment:
8+
VSCODE_BUILD_VERBOSE: true
9+
1410
addons:
1511
apt:
1612
sources:
@@ -24,8 +20,14 @@ addons:
2420
- libgtk2.0-0
2521
- libx11-dev
2622
- libxkbfile-dev
23+
- libsecret-1-dev
2724

2825
before_install:
26+
- git clone --depth 1 https://github.com/creationix/nvm.git ./.nvm
27+
- source ./.nvm/nvm.sh
28+
- nvm install 7.4.0
29+
- nvm use 7.4.0
30+
- npm install -g gulp
2931
- if [ $TRAVIS_OS_NAME == "linux" ]; then
3032
export CXX="g++-4.9" CC="gcc-4.9" DISPLAY=:99.0;
3133
sh -e /etc/init.d/xvfb start;
@@ -35,7 +37,6 @@ before_install:
3537
install:
3638
- cd client
3739
- npm install
38-
- npm install gulp
3940
- npm run vscode:prepublish
4041

4142
script:

client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@
195195
"@types/mocha": "^2.2.32"
196196
},
197197
"dependencies": {
198-
"vscode-languageclient": "^3.1.0",
198+
"vscode-languageclient": "~3.3.0",
199199
"vscode-extension-telemetry": "^0.0.6"
200200
}
201201
}

0 commit comments

Comments
 (0)