Skip to content

Fix ci build failures #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Dec 3, 2015
Merged

Fix ci build failures #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
552a0de
Edit .travis.yml and .eslintrc to address CI build failures
dylangrafmyre Dec 2, 2015
15fbc29
Update .travis.yml to install gcc-4.9
dylangrafmyre Dec 2, 2015
4922099
Remove global npm install, and set g++-4.9 package install
dylangrafmyre Dec 2, 2015
6cd3c64
Fix eslint plugin error
josiasds Dec 3, 2015
4ee6b03
Merge branch 'fix-eslint-plugin-error' into fix-ci-build-failures
josiasds Dec 3, 2015
dc7476f
Enable react/prop-types eslint rule
josiasds Dec 3, 2015
7fd2552
Update .travis.yml to use new build platform in CI
dylangrafmyre Dec 3, 2015
ab2e32a
Fix apt repository within .travis.yml
dylangrafmyre Dec 3, 2015
bc07695
Disable eslint react/prop-types rule on commentsStore; revert previou…
josiasds Dec 3, 2015
25c6b55
Add comment to explain disabled eslint rule
josiasds Dec 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,24 @@ language:
- ruby
rvm:
- 2.2.3
sudo: false
addons:
apt:
sources:
ubuntu-toolchain-r-test
packages:
g++-4.9
env:
global:
- RAILS_ENV=test
- CXX=g++-4.9
install:
- bundle install
- nvm install 5.0
- nvm use 5.0
- npm install -g npm
- npm install
- cd client && npm run build:client
- npm run build:server
env:
- export RAILS_ENV=test
before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
Expand Down
3 changes: 3 additions & 0 deletions client/app/stores/commentsStore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// react/prop-types rule is ignored because of this issue: https://github.com/yannickcr/eslint-plugin-react/issues/9
/* eslint react/prop-types: 0 */

import { compose, createStore, applyMiddleware, combineReducers } from 'redux';
import thunkMiddleware from 'redux-thunk';
import loggerMiddleware from '../middlewares/loggerMiddleware';
Expand Down