diff options
author | Daniel Doubrovkine (dB.) @dblockdotorg <dblock@dblock.org> | 2019-08-14 09:19:48 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-14 09:19:48 -0700 |
commit | 1de19bff87e1f75192af2788e8ee47cda593ade2 (patch) | |
tree | 1572bf7230e90896cbf034e0b4abd763724ee7a3 | |
parent | f0faaca6acc69689aa208c4420c258506a0596af (diff) | |
parent | 1ba80efb1d7dba49019cba44d27138b3ae9b16ae (diff) | |
download | hashie-1de19bff87e1f75192af2788e8ee47cda593ade2.tar.gz |
Merge pull request #482 from BobbyMcWho/travis-updates
Travis updates
-rw-r--r-- | .travis.yml | 23 | ||||
-rw-r--r-- | CHANGELOG.md | 1 |
2 files changed, 16 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index bd7ba6d..17f14c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,28 +3,35 @@ sudo: false cache: bundler rvm: - - 2.5.0 - - 2.4.3 - - 2.3.6 + - 2.5.3 + - 2.4.5 + - 2.3.8 - 2.2.9 - 2.1.10 - - rbx-3 - - jruby-9.0.5.0 - - jruby-head - ruby-head matrix: include: - - rvm: 2.5.0 + - rvm: 2.5.3 + name: "Run Danger and Code Climate" before_script: - bundle exec danger after_script: - bundle exec codeclimate-test-reporter - - rvm: 2.5.0 + - rvm: 2.5.3 + name: "Integration Tests" install: - for dir in spec/integration/*; do BUNDLE_GEMFILE=$dir/Gemfile bundle; done script: - set -e ; for dir in spec/integration/*; do BUNDLE_GEMFILE=$dir/Gemfile bundle exec rspec $dir; done + - rvm: 2.6.3 + dist: bionic + - rvm: rbx-3 + dist: trusty + - rvm: jruby-9.0.5.0 + dist: trusty + - rvm: jruby-head + dist: trusty allow_failures: - rvm: ruby-head - rvm: jruby-head diff --git a/CHANGELOG.md b/CHANGELOG.md index cabbd6a..04b6170 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,7 @@ scheme are considered to be bugs. ### Miscellaneous * [#465](https://github.com/intridea/hashie/pull/465): Clean up our RuboCop configuration and fix the outstanding line length violations. This involved some minor refactoring on `Hashie::Extensions::Coercion`, `Hashie::Extensions::Dash::IndifferentAccess`, `Hashie::Extensions::DeepLocate`, `Hashie::Extensions::Mash::SafeAssignment`, and `Hashie::Hash`, but none that were detectable via the test suite - [@michaelherold](https://github.com/michaelherold). +* [#482](https://github.com/intridea/hashie/pull/482): Update Travis configs to make jruby builds run on trusty dist. - [@BobbyMcWho](https://github.com/BobbyMcWho). * Your contribution here. ## [3.6.0] - 2018-08-13 |