Skip to content

Commit ec6a14c

Browse files
committed
roll back travis setting. Downgrade jest & jest-cli to 21.1.0 from 22.0.4
1 parent b329cff commit ec6a14c

File tree

2 files changed

+23
-13
lines changed

2 files changed

+23
-13
lines changed

.travis.yml

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,43 @@
1-
os: osx
1+
dist: trusty
22

33
language: node_js
44

55
node_js:
6-
- "6"
7-
- "8"
6+
- '8'
7+
- '6'
88

99
addons:
1010
apt:
1111
sources:
12-
- ubuntu-toolchain-r-test
12+
- ubuntu-toolchain-r-test
1313
packages:
14-
- g++-4.8
14+
- gcc-4.8
15+
- g++-4.8
1516

16-
sudo: false
17+
sudo: required
18+
19+
before_install:
20+
- sudo apt-get -qq update
21+
- curl -o- -L https://yarnpkg.com/install.sh | bash
22+
- export PATH="$HOME/.yarn/bin:$PATH"
23+
24+
install:
25+
- yarn
1726

1827
before_script:
1928
- export DISPLAY=:99.0
2029
- sh -e /etc/init.d/xvfb start
2130
- export NODE_ENV=development
2231

2332
cache:
33+
yarn: true
2434
directories:
2535
- node_modules
2636

2737
script:
28-
- npm run lint
29-
- npm run test
30-
- npm run test-node
38+
- yarn lint
39+
- yarn test
40+
- yarn test-node
3141

3242
env:
33-
- CXX=g++-4.8
43+
- TRAVIS=travis CXX=g++-4.8

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@
195195
},
196196
"devDependencies": {
197197
"babel-eslint": "^8.0.3",
198-
"babel-jest": "^22.0.4",
198+
"babel-jest": "^22.0.6",
199199
"babel-loader": "^7.0.0",
200200
"babel-plugin-transform-react-jsx-source": "^6.22.0",
201201
"better-npm-run": "^0.1.0",
@@ -217,8 +217,8 @@
217217
"html-webpack-plugin": "^2.30.1",
218218
"husky": "^0.14.3",
219219
"identity-obj-proxy": "^3.0.0",
220-
"jest": "^22.0.4",
221-
"jest-cli": "^22.0.4",
220+
"jest": "^21.1.0",
221+
"jest-cli": "^21.1.0",
222222
"less": "^3.0.0-alpha.3",
223223
"less-loader": "^4.0.3",
224224
"lighthouse": "^2.6.0",

0 commit comments

Comments
 (0)