Skip to content

Commit

Permalink
Merge pull request #274 from phstc/fix-travis-ci
Browse files Browse the repository at this point in the history
Trying to fix depecreation warning in Travis CI
  • Loading branch information
phstc authored Nov 26, 2016
2 parents bb97137 + bd5643a commit 0470269
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
7 changes: 2 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
language: ruby
rvm:
# - 1.9.3
# - 1.9.2
- 2.0.0
- 2.1.0
- 2.2.0
# - ruby-head
# - jruby-19mode
# - jruby-head

notifications:
email:
Expand All @@ -17,3 +12,5 @@ notifications:
script: SPEC_ALL=true bundle exec rspec spec
before_install:
- gem update bundler
after_success:
- bundle exec codeclimate-test-reporter
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@ gemspec

group :test do
gem 'codeclimate-test-reporter', require: nil
gem "simplecov"
gem 'multi_xml'
end
4 changes: 2 additions & 2 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
Dotenv.load

if ENV['CODECLIMATE_REPO_TOKEN']
require 'codeclimate-test-reporter'
CodeClimate::TestReporter.start
require 'simplecov'
SimpleCov.start
end

config_file = File.join(File.expand_path('../..', __FILE__), 'spec', 'shoryuken.yml')
Expand Down

0 comments on commit 0470269

Please sign in to comment.