Skip to content
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

Fix travis not running specs #57

Merged
merged 2 commits into from
Apr 5, 2017
Merged

Fix travis not running specs #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37ef917
Run specs in travis :flushed:
valscion Apr 5, 2017
8de1de9
Remove configuration that never worked from TravisCI
valscion Apr 5, 2017
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
7 changes: 1 addition & 6 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,11 @@ sudo: false
env:
- JSONAPI_RESOURCES_VERSION=0.8.0.beta1 RAILS_VERSION=4.1.0
- JSONAPI_RESOURCES_VERSION=0.8.0.beta1 RAILS_VERSION=4.2.0
- JSONAPI_RESOURCES_VERSION=master RAILS_VERSION=4.2.0
- JSONAPI_RESOURCES_VERSION=master RAILS_VERSION=4.1.0
rvm:
- 2.1.2
before_install: gem install bundler -v 1.11.2
notifications:
email: false
matrix:
allow_failures:
- env: JSONAPI_RESOURCES_VERSION=master RAILS_VERSION=4.2.0
- env: JSONAPI_RESOURCES_VERSION=master RAILS_VERSION=4.1.0
script:
- ./bin/phare
- bundle exec rake
2 changes: 0 additions & 2 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ else
end

case jsonapi_resources_version
when 'master'
gem 'jsonapi-resources', git: 'https://github.com/cerebris/jsonapi-resources.git'
when 'default'
gem 'jsonapi-resources', '0.8.0.beta1'
else
Expand Down