diff --git a/.travis.yml b/.travis.yml index 72a34b0a..61c9497c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/Gemfile b/Gemfile index 96f2e6b0..26ccee57 100644 --- a/Gemfile +++ b/Gemfile @@ -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