diff --git a/.rubocop_basic.yml b/.rubocop_basic.yml index ba3b32daa..42dfb1b20 100644 --- a/.rubocop_basic.yml +++ b/.rubocop_basic.yml @@ -9,7 +9,6 @@ AllCops: Exclude: - "db/migrate/**/*" - "db/schema.rb" - TargetRubyVersion: 2.3 # RuboCop has a bunch of cops enabled by default. This setting tells RuboCop # to ignore them, so only the ones explicitly set in this file are enabled. DisabledByDefault: true diff --git a/.travis.yml b/.travis.yml index faf764341..a6741da68 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,6 @@ language: ruby addons: postgresql: "9.4" chrome: stable -rvm: -- 2.3.2 cache: bundler bundler_args: --without development before_script: diff --git a/config/deploy.rb b/config/deploy.rb index 7f8cd2568..1a558eacb 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -7,7 +7,6 @@ def deploysecret(key) end set :rails_env, fetch(:stage) -set :rvm1_ruby_version, "2.3.2" set :rvm1_map_bins, -> { fetch(:rvm_map_bins).to_a.concat(%w[rake gem bundle ruby]).uniq } set :application, "consul" @@ -63,7 +62,9 @@ end task :install_bundler_gem do on roles(:app) do - execute "rvm use #{fetch(:rvm1_ruby_version)}; gem install bundler" + within release_path do + execute "rvm use #{fetch(:rvm1_ruby_version)}; gem install bundler" + end end end