Skip to content

Commit 552a0de

Browse files
committed
Edit .travis.yml and .eslintrc to address CI build failures
1 parent cd35765 commit 552a0de

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ language:
22
- ruby
33
rvm:
44
- 2.2.3
5+
env:
6+
- export RAILS_ENV=test
7+
- CXX=g++-4.9
58
install:
69
- bundle install
710
- nvm install 5.0
@@ -10,8 +13,6 @@ install:
1013
- npm install
1114
- cd client && npm run build:client
1215
- npm run build:server
13-
env:
14-
- export RAILS_ENV=test
1516
before_script:
1617
- export DISPLAY=:99.0
1718
- sh -e /etc/init.d/xvfb start

client/.eslintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ rules:
4040
react/no-did-update-set-state: 0
4141
react/no-multi-comp: 2
4242
react/no-unknown-property: 2
43-
react/prop-types: 1
43+
react/prop-types: 0
4444
react/react-in-jsx-scope: 2
4545
react/require-extension: [1, { extensions: [.js, .jsx] }]
4646
react/self-closing-comp: 2

0 commit comments

Comments
 (0)