diff options
author | Abinoam P. Marques Jr <abinoam@gmail.com> | 2017-06-25 04:19:18 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-25 04:19:18 -0300 |
commit | 536d7e29c490df37d6ffeac43de64ba54563e53f (patch) | |
tree | ccce57bc2cbb93a241250908e95eb545a322d259 | |
parent | c227ef5d49e79d1b9bd7bb76d96cf506a2954e4f (diff) | |
parent | 80c6d8cb6479a0fa72286e7d032ed5ab97a80dff (diff) | |
download | highline-536d7e29c490df37d6ffeac43de64ba54563e53f.tar.gz |
Merge pull request #213 from JEG2/update_travis
Update some travis and appveyor settings
-rw-r--r-- | .travis.yml | 11 | ||||
-rw-r--r-- | Gemfile | 8 | ||||
-rw-r--r-- | appveyor.yml | 2 | ||||
-rw-r--r-- | test/test_helper.rb | 3 |
4 files changed, 17 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index a13fe9f..5657690 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,15 @@ --- language: ruby +dist: trusty sudo: false -script: "bundle exec rake test && bundle exec codeclimate-test-reporter" +script: "bundle exec rake test" rvm: - 1.9 - 2.0 - 2.1 - 2.2 - - 2.3.0 - ruby-head - - rbx-2 + - rbx-3.81 - jruby-19mode # JRuby in 1.9 mode - jruby-head @@ -19,7 +19,10 @@ matrix: allow_failures: - rvm: 1.9 - rvm: ruby-head - - rvm: rbx-2 + - rvm: rbx-3.81 - rvm: jruby-19mode # JRuby in 1.9 mode - rvm: jruby-head + include: + - rvm: 2.3 + script: "bundle exec rake test && bundle exec codeclimate-test-reporter" # Run only for 2.3 bundler_args: --without development @@ -8,8 +8,14 @@ group :development, :test do gem "minitest", require: false end + +# Reporting only at one ruby version of travis matrix (no repetition) gem "codeclimate-test-reporter", group: :test, require: false -gem "simplecov", group: :test, require: false + +platform :ruby do + # Running only on MRI + gem "simplecov", group: :test +end group :development do gem 'pronto' diff --git a/appveyor.yml b/appveyor.yml index da28b2b..eca79c7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,7 +10,7 @@ environment: install: - SET PATH=C:\Ruby%ruby_version%\bin;%PATH% - gem install bundler --no-document -v 1.10.5 - - bundle install --retry=3 + - bundle install --retry=3 --without development test_script: - bundle exec rake diff --git a/test/test_helper.rb b/test/test_helper.rb index 161912b..65c7646 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,7 +1,8 @@ #!/usr/bin/env ruby # coding: utf-8 -require 'simplecov' +# Run code coverage only for mri +require 'simplecov' if RUBY_ENGINE == 'ruby' # Compatibility module for StringIO, File # and Tempfile. Necessary for some tests. |