From 37ef91770e903ad347e17e0be3ff0b16e0292cba Mon Sep 17 00:00:00 2001 From: Vesa Laakso Date: Wed, 5 Apr 2017 10:51:32 +0300 Subject: [PATCH 1/2] Run specs in travis :flushed: Seems like ever since the phare script was added to CI, the specs themselves weren't running anymore. Yikes! --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 72a34b0a..384bfc8a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,3 +17,4 @@ matrix: - env: JSONAPI_RESOURCES_VERSION=master RAILS_VERSION=4.1.0 script: - ./bin/phare + - bundle exec rake From 8de1de9d3912969c74814aba70df58bd2ad36405 Mon Sep 17 00:00:00 2001 From: Vesa Laakso Date: Wed, 5 Apr 2017 11:02:38 +0300 Subject: [PATCH 2/2] Remove configuration that never worked from TravisCI The builds never ran against the master version of JR, so it adds no value to try to run it anyway. --- .travis.yml | 6 ------ Gemfile | 2 -- 2 files changed, 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 384bfc8a..61c9497c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,17 +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