diff --git a/.travis.yml b/.travis.yml index e448640f..f4a35441 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,9 @@ env: - VAULT_VERSION=0.3.1 before_install: + # Downgrade Bundler to 1.x + - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true + - gem install bundler -v '< 2' - wget -O vault.zip -q https://releases.hashicorp.com/vault/${VAULT_VERSION}/vault_${VAULT_VERSION}_linux_amd64.zip - unzip vault.zip - mkdir -p ~/bin @@ -24,10 +27,9 @@ branches: - master rvm: - - 2.2.10 - - 2.3.8 - - 2.4.5 - - 2.5.3 + - "2.4" + - "2.5" + - "2.6" before_script: - bundle exec rake app:db:create diff --git a/Appraisals b/Appraisals index 40267be3..6b02f1a9 100644 --- a/Appraisals +++ b/Appraisals @@ -1,7 +1,3 @@ -appraise "rails-4.1" do - gem "rails", "~> 4.1.0" -end if RUBY_VERSION.to_f < 2.4 - appraise "rails-4.2" do gem "rails", "~> 4.2.0" end