.travis.yml in activeadmin-1.0.0 vs .travis.yml in activeadmin-1.1.0

- old
+ new

@@ -2,10 +2,12 @@ language: ruby sudo: false +dist: trusty + bundler_args: --without development branches: only: - master @@ -14,19 +16,18 @@ before_install: - PATH=$(npm bin):$PATH # needed to install phantomjs via npm - if [ $(phantomjs --version) != '2.1.1' ]; then npm install phantomjs-prebuilt@2.1; fi - gem update --system # use the very latest Rubygems - - rvm @global do gem uninstall bundler -a -x - - rvm @global do gem install bundler -v 1.14.6 # latest version known to work + - gem install bundler # use the very latest Bundler script: - bundle exec rake + - bundle exec rake docs:build rvm: - - jruby-9.1.8.0 - - 2.1.10 + - jruby-9.1.12.0 - 2.2.7 - 2.3.4 - 2.4.1 gemfile: @@ -35,32 +36,16 @@ - gemfiles/rails_51.gemfile env: global: - JRUBY_OPTS="-J-Xmx1024m --dev --debug" + - JAVA_OPTS="-Djava.security.egd=file:/dev/./urandom" + - COVERAGE=true matrix: fast_finish: true - exclude: - - rvm: 2.1.10 - gemfile: gemfiles/rails_50.gemfile - - rvm: 2.1.10 - gemfile: gemfiles/rails_51.gemfile - allow_failures: - - rvm: jruby-9.1.8.0 + - rvm: jruby-9.1.12.0 gemfile: gemfiles/rails_50.gemfile - - rvm: jruby-9.1.8.0 + - rvm: jruby-9.1.12.0 gemfile: gemfiles/rails_51.gemfile - -notifications: - irc: - channels: - - irc.freenode.org#activeadmin - - on_success: change - on_failure: always - skip_join: true - - template: - - "(%{branch}/%{commit} by %{author}): %{message} (%{build_url})"